diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-10-08 13:41:42 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-11-03 22:29:40 -0500 |
| commit | 049d1ee76af2f4702c28cb49ed0f884318d790d4 (patch) | |
| tree | 61941c47d9d478699fa691315eaa755724c7aaf6 | |
| parent | 848ff00b7dffb9a6dbd63323a8909a7faecd7d7c (diff) | |
| download | haskell-wip/fix-aarch64.tar.gz | |
gitlab-ci: Work around #16912 in aarch64 buildwip/fix-aarch64
Currently we bootstrap aarch64 using 8.8.1 since this is the first
release not affected by #15449. However, 8.8.1 is affected by LLVM
version detection issues (#16912). Disable the errant warning during
bootstrapping for the time being.
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rwxr-xr-x | .gitlab/prepare-system.sh | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0df90d6aa1..ecc90a5638 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -311,6 +311,8 @@ hadrian-ghc-in-ghci: .validate-linux: extends: .validate + variables: + EXTRA_BUILD_MK: "" tags: - x86_64-linux before_script: @@ -430,6 +432,8 @@ validate-x86_64-darwin: variables: TEST_ENV: "aarch64-linux-deb9" BIN_DIST_PREP_TAR_COMP: "ghc-aarch64-linux-deb9.tar.xz" + # Work around #16912 + EXTRA_BUILD_MK: "SRC_HC_OPTS_STAGE0 += -Wno-unsupported-llvm-version" cache: key: linux-aarch64-deb9 tags: @@ -464,6 +468,8 @@ nightly-aarch64-linux-deb9: TEST_ENV: "armv7-linux-deb9" BIN_DIST_PREP_TAR_COMP: "ghc-armv7-linux-deb9.tar.xz" CONFIGURE_ARGS: "--host=armv7-linux-gnueabihf --build=armv7-linux-gnueabihf --target=armv7-linux-gnueabihf" + # Work around #16912 + EXTRA_BUILD_MK: "SRC_HC_OPTS_STAGE0 += -Wno-unsupported-llvm-version" cache: key: linux-armv7-deb9 tags: diff --git a/.gitlab/prepare-system.sh b/.gitlab/prepare-system.sh index 56dba70065..585793608d 100755 --- a/.gitlab/prepare-system.sh +++ b/.gitlab/prepare-system.sh @@ -13,6 +13,7 @@ if [[ -z ${BUILD_SPHINX_HTML:-} ]]; then BUILD_SPHINX_HTML=YES; fi if [[ -z ${BUILD_SPHINX_PDF:-} ]]; then BUILD_SPHINX_PDF=YES; fi if [[ -z ${INTEGER_LIBRARY:-} ]]; then INTEGER_LIBRARY=integer-gmp; fi if [[ -z ${BUILD_FLAVOUR:-} ]]; then BUILD_FLAVOUR=perf; fi +if [[ -z ${EXTRA_BUILD_MK:-} ]]; then EXTRA_BUILD_MK=""; fi cat > mk/build.mk <<EOF V=1 @@ -32,6 +33,7 @@ ifneq "\$(BuildFlavour)" "" include mk/flavours/\$(BuildFlavour).mk endif GhcLibHcOpts+=-haddock +$EXTRA_BUILD_MK EOF case "$(uname)" in |