diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-11-15 19:48:17 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-11-18 22:27:20 -0500 |
| commit | 048f8d965b2f303a083e9e7c537c8b92a8bfb9d6 (patch) | |
| tree | f0361a20519386afe213dcac91f833138da2b709 | |
| parent | 7f7d7888572358a4df43b3db6b3bb0061fccfd10 (diff) | |
| download | haskell-048f8d965b2f303a083e9e7c537c8b92a8bfb9d6.tar.gz | |
gitlab-ci: Bump MACOSX_DEPLOYMENT_TARGET
It appears that Darwin's toolchain includes system headers in the
dependency makefiles it generates with `-M` with older
`MACOSX_DEPLOYMENT_TARGETS`. To avoid this we have bumped the deployment
target for x86-64/Darwin to 10.10.
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3d7bcaa1e..07e3e176f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -549,7 +549,7 @@ validate-x86_64-darwin: GHC_VERSION: 8.10.4 CABAL_INSTALL_VERSION: 3.2.0.0 BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-apple-darwin.tar.xz" - MACOSX_DEPLOYMENT_TARGET: "10.7" + MACOSX_DEPLOYMENT_TARGET: "10.10" # Only Sierra and onwards supports clock_gettime. See #12858 ac_cv_func_clock_gettime: "no" # Only newer OS Xs support utimensat. See #17895 @@ -604,9 +604,7 @@ validate-aarch64-darwin: GHC_VERSION: 8.10.3 CABAL_INSTALL_VERSION: 3.2.0.0 BIN_DIST_PREP_TAR_COMP: "ghc-arm64-apple-darwin.tar.xz" - # we run on M1's for now, getconf can't be built with nix yet, - # and we use a pure shell, so we can't/shouldn't use /usr/bin/getconf - # inside th shell. + MACOSX_DEPLOYMENT_TARGET: "11.0" CPUS: 8 LANG: "en_US.UTF-8" # WARNING: this is overridden in the shell.nix, see shell.nix! |