zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clingo-bootstrap: no need for setting MACOSX_DEPLOYMENT_TARGET (#47065)

Browse Source 
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 <haampie@users.noreply.github.com>
This commit is contained in:
Harmen Stoppels 2024-10-18 12:03:58 +02:00 committed by GitHub
parent 580cc3c91b
commit d36452cf4e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/clingo-bootstrap/package.py
View File

@ -75,15 +75,7 @@ def cmake_py_shared(self):
return self.define("CLINGO_BUILD_PY_SHARED", "OFF") return self.define("CLINGO_BUILD_PY_SHARED", "OFF")
def cmake_args(self): def cmake_args(self):
args = super().cmake_args() return [*super().cmake_args(), self.define("CLINGO_BUILD_APPS", False)]
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") @run_before("cmake", when="+optimized")
def pgo_train(self): def pgo_train(self):