From adaa0a4863a810fa99d392a96c372f8be45e81f4 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Thu, 17 Oct 2024 13:38:59 +0200 Subject: clingo: use CMAKE_OSX_DEPLOYMENT_TARGET instead of *flags (#47043) --- var/spack/repos/builtin/packages/clingo-bootstrap/package.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py index 67bab58d7a..143930d651 100644 --- a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py @@ -77,6 +77,12 @@ class ClingoBootstrap(Clingo): def cmake_args(self): args = super().cmake_args() args.append(self.define("CLINGO_BUILD_APPS", False)) + if self.spec.satisfies("platform=darwin target=aarch64:"): + # big sur is first to support darwin-aarch64 + args.append(self.define("CMAKE_OSX_DEPLOYMENT_TARGET", "11")) + elif self.spec.satisfies("platform=darwin target=x86_64:"): + # for x86_64 use highsierra + args.append(self.define("CMAKE_OSX_DEPLOYMENT_TARGET", "10.13")) return args @run_before("cmake", when="+optimized") @@ -136,9 +142,5 @@ class ClingoBootstrap(Clingo): cmake.add_default_envmod(use_mods) def setup_build_environment(self, env): - if self.spec.satisfies("%apple-clang"): - env.append_flags("CFLAGS", "-mmacosx-version-min=10.13") - env.append_flags("CXXFLAGS", "-mmacosx-version-min=10.13") - env.append_flags("LDFLAGS", "-mmacosx-version-min=10.13") - elif self.spec.compiler.name in ("gcc", "clang") and "+static_libstdcpp" in self.spec: + if self.spec.compiler.name in ("gcc", "clang") and "+static_libstdcpp" in self.spec: env.append_flags("LDFLAGS", "-static-libstdc++ -static-libgcc -Wl,--exclude-libs,ALL") -- cgit v1.2.3-70-g09d2