From e6c9650ae773b430657093dbbacde8538165ff62 Mon Sep 17 00:00:00 2001 From: Elvis Pranskevichus Date: Wed, 16 Oct 2024 12:36:10 -0700 Subject: [PATCH] Set `MACOSX_DEPLOYMENT_TARGET` in build steps in macOS --- metapkg/targets/base.py | 5 +++++ metapkg/targets/macos/__init__.py | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/metapkg/targets/base.py b/metapkg/targets/base.py index 1c1bc79..46554c7 100644 --- a/metapkg/targets/base.py +++ b/metapkg/targets/base.py @@ -191,6 +191,9 @@ def get_shlib_relpath_run_time_ldflags( def get_global_cflags(self, build: Build) -> list[str]: return [] + def get_global_env(self, build: Build) -> dict[str, str]: + return {} + def get_global_cxxflags(self, build: Build) -> list[str]: return self.get_global_cflags(build) @@ -1949,6 +1952,8 @@ def sh_append_global_flags( if args is None: args = {} conf_args = dict(args) + for k, v in self.target.get_global_env(self).items(): + self.sh_append_flags(conf_args, k, [v]) if global_cflags: self.sh_append_flags(conf_args, "CFLAGS", global_cflags) if global_cxxflags: diff --git a/metapkg/targets/macos/__init__.py b/metapkg/targets/macos/__init__.py index f8bbc4c..1bd1032 100644 --- a/metapkg/targets/macos/__init__.py +++ b/metapkg/targets/macos/__init__.py @@ -461,6 +461,11 @@ def get_shlib_relpath_run_time_ldflags( ) -> list[str]: return [] + def get_global_env(self, build: targets.Build) -> dict[str, str]: + return super().get_global_env(build) | { + "MACOSX_DEPLOYMENT_TARGET": self.min_supported_version, + } + def get_global_cflags(self, build: targets.Build) -> list[str]: flags = super().get_global_cflags(build) return flags + [