diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-09-18 01:09:45 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2021-09-18 01:09:45 -0400 |
| commit | de9eb4f06a9edebf69061705c8782e49f9fba2bc (patch) | |
| tree | 8e05a3ae7fcf47f46b932d81b27b60a78c5b119d /.gitlab-ci.yml | |
| parent | d0b0d3eff9aba506d97a571f9c5a5838d47e7e58 (diff) | |
| download | haskell-de9eb4f06a9edebf69061705c8782e49f9fba2bc.tar.gz | |
gitlab-ci: squash
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0888a1be5f..ac6b6712ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -560,13 +560,15 @@ validate-x86_64-darwin: CPUS: 8 LANG: "en_US.UTF-8" # WARNING: this is overridden in the shell.nix, see shell.nix! - CONFIGURE_ARGS: "--with-intree-gmp --with-iconv-libraries=/usr/lib --with-iconv-includes=/usr/include" + CONFIGURE_ARGS: "--with-intree-gmp --with-system-libffi" HADRIAN_ARGS: "--docs=no-sphinx" TEST_ENV: "x86_64-darwin-hadrian" BIN_DIST_NAME: "ghc-amd64-apple-darwin" BUILD_FLAVOUR: "validate" # Due to #19025 IGNORE_PERF_FAILURES: "all" + # Capi_Ctype_001 Capi_Ctype_002 T12010 T14923 T16737 T20199 bkpreex03 cc017 section_alignment: Due to # + BROKEN_TESTS: "Capi_Ctype_001 Capi_Ctype_002 T12010 T14923 T16737 T20199 bkpreex03 cc017" after_script: - .gitlab/ci.sh clean - cat ci-timings @@ -574,6 +576,10 @@ validate-x86_64-darwin: script: | nix build -f .gitlab/darwin/toolchain.nix --argstr system x86_64-darwin -o toolchain.sh source toolchain.sh + cat toolchain.sh + + sdk_path="$(xcrun --sdk macosx --show-sdk-path)" + CONFIGURE_ARGS="$CONFIGURE_ARGS --with-ffi-libraries=$sdk_path/usr/lib --with-ffi-includes=$sdk_path/usr/include/ffi" # fix up config.sub in libraries for the time. # aarch64-darwin is not supported in older config.sub's @@ -610,7 +616,7 @@ validate-aarch64-darwin: CPUS: 8 LANG: "en_US.UTF-8" # WARNING: this is overridden in the shell.nix, see shell.nix! - CONFIGURE_ARGS: "--with-intree-gmp --with-iconv-libraries=/usr/lib --with-iconv-includes=/usr/include" + CONFIGURE_ARGS: "--with-intree-gmp --with-system-libffi" HADRIAN_ARGS: "--docs=no-sphinx" BIN_DIST_NAME: "ghc-arm64-apple-darwin" TEST_ENV: "aarch64-darwin-hadrian" @@ -624,6 +630,10 @@ validate-aarch64-darwin: script: | nix build -f .gitlab/darwin/toolchain.nix --argstr system aarch64-darwin -o toolchain.sh source toolchain.sh + cat toolchain.sh + + sdk_path="$(xcrun --sdk macosx --show-sdk-path)" + CONFIGURE_ARGS="$CONFIGURE_ARGS --with-ffi-libraries=$sdk_path/usr/lib --with-ffi-includes=$sdk_path/usr/include/ffi" # fix up config.sub in libraries for the time. # aarch64-darwin is not supported in older config.sub's |