diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-06-02 13:03:00 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-06-02 13:03:30 -0400 |
| commit | d6279ff0841edee10a665275ed0d2402565fac6d (patch) | |
| tree | 21f6828fe70a617ec2fe1c3f6ee8a0844c3999ae | |
| parent | 120aedbdff7dbb9b394dadabb1f431608b42de67 (diff) | |
| download | haskell-d6279ff0841edee10a665275ed0d2402565fac6d.tar.gz | |
gitlab-ci: Ensure that workaround for #18280 applies to bindisttest
We need to ensure that the `configure` flags working around #18280 are
propagated to the bindisttest `configure` as well.
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de311ce1ea..47ce78c6f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -482,9 +482,11 @@ nightly-aarch64-linux-deb9: variables: 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" # N.B. We disable ld.lld explicitly here because it appears to fail # non-deterministically on ARMv7. See #18280. - CONFIGURE_ARGS: "--host=armv7-linux-gnueabihf --build=armv7-linux-gnueabihf --target=armv7-linux-gnueabihf LD=ld.gold GccUseLdOpt=-fuse-ld=gold" + LD: "ld.gold" + GccUseLdOpt: "-fuse-ld=gold" cache: key: linux-armv7-deb9 tags: |