Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 00:25:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace "-mmacosx-version-min" with MACOSX_DEPLOYMENT_TARGET (#30102)

Browse source 
It's unclear if the compiler flag was doing anything, but I've verified
(with otool) that the environment variable does affect the minimum
version of the MacOS set in the binary. We could examine later if this
is still necessary.

This was added in #23163 when switching CI from gcc to clang.
This commit is contained in:
Martin Robinson 2023-08-15 16:49:05 +02:00 • committed by GitHub
parent 16445983ec
commit 83a46f68db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.cargo/config
View file

@ -35,4 +35,7 @@ linker = "lld-link.exe"
linker = "lld-link.exe"
[target.aarch64-uwp-windows-msvc]
linker = "lld-link.exe"
linker = "lld-link.exe"
[env]
MACOSX_DEPLOYMENT_TARGET = "10.10"

7
python/servo/build_commands.py
View file

@ -79,15 +79,10 @@ class MachCommands(CommandBase):
build_start = time()
host = servo.platform.host_triple()
target_triple = self.cross_compile_target or servo.platform.host_triple()
if 'apple-darwin' in host and target_triple == host:
if 'CXXFLAGS' not in env:
env['CXXFLAGS'] = ''
env["CXXFLAGS"] += "-mmacosx-version-min=10.10"
if 'windows' in host:
vs_dirs = self.vs_dirs()
target_triple = self.cross_compile_target or servo.platform.host_triple()
if host != target_triple and 'windows' in target_triple:
if os.environ.get('VisualStudioVersion') or os.environ.get('VCINSTALLDIR'):
print("Can't cross-compile for Windows inside of a Visual Studio shell.\n"