diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-10-29 18:48:50 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-10-30 18:15:52 -0400 |
| commit | 4898df1cc25132dc9e2599d4fa4e1bbc9423cda5 (patch) | |
| tree | 9b2b91a4544cc24adca54848038ebc37dfe9c649 | |
| parent | 3e7569bcd4a88ba45d2c40b0904c587c2edf4972 (diff) | |
| download | haskell-4898df1cc25132dc9e2599d4fa4e1bbc9423cda5.tar.gz | |
gitlab-ci: Fix the ARMv7 triple
Previously we were configuring the ARMv7 builds with a host/target
triple of arm-linux-gnueabihf, which caused us to target ARMv6 and
consequently rely on the old CP15 memory barrier implementation. This
barrier has to be emulated on ARMv8 machines which is glacially slow.
Hopefully this should fix the ARMv7 builds which currently consistently
time out.
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c0abfb5e2..5b0d9b4e9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -463,7 +463,7 @@ nightly-aarch64-linux-deb9: variables: TEST_ENV: "armv7-linux-deb9" BIN_DIST_PREP_TAR_COMP: "ghc-armv7-linux-deb9.tar.xz" - CONFIGURE_ARGS: "--host=arm-linux-gnueabihf --build=arm-linux-gnueabihf --target=arm-linux-gnueabihf" + CONFIGURE_ARGS: "--host=armv7-linux-gnueabihf --build=armv7-linux-gnueabihf --target=armv7-linux-gnueabihf" cache: key: linux-armv7-deb9 tags: |