From 83a46f68db17de3b84596c4af97e73dbcf7abd6a Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Tue, 15 Aug 2023 16:49:05 +0200 Subject: [PATCH] Replace "-mmacosx-version-min" with MACOSX_DEPLOYMENT_TARGET (#30102) 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. --- .cargo/config | 5 ++++- python/servo/build_commands.py | 7 +------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.cargo/config b/.cargo/config index 9df45ac6ba9..ef627b28bab 100644 --- a/.cargo/config +++ b/.cargo/config @@ -35,4 +35,7 @@ linker = "lld-link.exe" linker = "lld-link.exe" [target.aarch64-uwp-windows-msvc] -linker = "lld-link.exe" \ No newline at end of file +linker = "lld-link.exe" + +[env] +MACOSX_DEPLOYMENT_TARGET = "10.10" diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index f0968a235bf..4b0858f6ff1 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -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"