From d36452cf4e70fa1da8b9db43921850872b82ced9 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Fri, 18 Oct 2024 12:03:58 +0200 Subject: clingo-bootstrap: no need for setting MACOSX_DEPLOYMENT_TARGET (#47065) Turns out `os=...` of the spec and `MACOSX_DEPLOYMENT_TARGET` are kept in sync, and the env variable is used to initialize `CMAKE_MACOSX_DEPLOYMENT_TARGET`. In bootstrap code we set the env variable, so these bits are redundant. --------- Co-authored-by: haampie --- var/spack/repos/builtin/packages/clingo-bootstrap/package.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py index 143930d651..4f3b8ac74a 100644 --- a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py @@ -75,15 +75,7 @@ class ClingoBootstrap(Clingo): return self.define("CLINGO_BUILD_PY_SHARED", "OFF") 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 + return [*super().cmake_args(), self.define("CLINGO_BUILD_APPS", False)] @run_before("cmake", when="+optimized") def pgo_train(self): -- cgit v1.2.3-70-g09d2