diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-04-30 15:05:56 -0400 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-05-04 09:13:45 +0100 |
| commit | e5811c04e0b1cdf0fd0204e2db1533546deb8a14 (patch) | |
| tree | 343c168c8771be8b48ebf56637437e07a04528b1 | |
| parent | 3de395aa04bcb16be473a87ea8fa456f19ad5515 (diff) | |
| download | haskell-e5811c04e0b1cdf0fd0204e2db1533546deb8a14.tar.gz | |
gitlab-ci: Use ld.lld on ARMv7/Linux
Due to #16177.
Also cleanup some code style issues.
(cherry picked from commit cc1c3861e2372f464bf9e3c9c4d4bd83f275a1a6)
| -rwxr-xr-x | .gitlab/gen_ci.hs | 16 | ||||
| -rw-r--r-- | .gitlab/jobs.yaml | 6 |
2 files changed, 14 insertions, 8 deletions
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs index c571381f11..b7b8e17fa0 100755 --- a/.gitlab/gen_ci.hs +++ b/.gitlab/gen_ci.hs @@ -309,6 +309,11 @@ opsysVariables _ FreeBSD = mconcat , "GHC_VERSION" =: "9.2.2" , "CABAL_INSTALL_VERSION" =: "3.2.0.0" ] +opsysVariables ARMv7 (Linux distro) = + distroVariables distro <> + mconcat [ -- ld.gold is affected by #16177 and therefore cannot be used. + "CONFIGURE_ARGS" =: "LD=ld.lld" + ] opsysVariables _ (Linux distro) = distroVariables distro opsysVariables AArch64 (Darwin {}) = mconcat [ "NIX_SYSTEM" =: "aarch64-darwin" @@ -342,13 +347,14 @@ opsysVariables _ _ = mempty distroVariables :: LinuxDistro -> Variables distroVariables Alpine = mconcat - [ "CONFIGURE_ARGS" =: "--disable-ld-override" + [ -- Due to #20266 + "CONFIGURE_ARGS" =: "--disable-ld-override" , "INSTALL_CONFIGURE_ARGS" =: "--disable-ld-override" , "HADRIAN_ARGS" =: "--docs=no-sphinx" --- encoding004: due to lack of locale support --- T10458, ghcilink002: due to #17869 --- linker_unload_native: due to musl not supporting any means of probing dynlib dependencies --- (see Note [Object unloading]). + -- encoding004: due to lack of locale support + -- T10458, ghcilink002: due to #17869 + -- linker_unload_native: due to musl not supporting any means of probing dynlib dependencies + -- (see Note [Object unloading]). , "BROKEN_TESTS" =: "encoding004 T10458 ghcilink002 linker_unload_native" ] distroVariables Fedora33 = mconcat diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml index c3dd89ce59..2b18d545b4 100644 --- a/.gitlab/jobs.yaml +++ b/.gitlab/jobs.yaml @@ -171,7 +171,7 @@ "BIGNUM_BACKEND": "gmp", "BIN_DIST_NAME": "ghc-armv7-linux-deb10-validate", "BUILD_FLAVOUR": "validate", - "CONFIGURE_ARGS": "", + "CONFIGURE_ARGS": "LD=ld.lld ", "TEST_ENV": "armv7-linux-deb10-validate" } }, @@ -405,7 +405,7 @@ "BIGNUM_BACKEND": "gmp", "BIN_DIST_NAME": "ghc-armv7-linux-deb10-validate", "BUILD_FLAVOUR": "validate", - "CONFIGURE_ARGS": "", + "CONFIGURE_ARGS": "LD=ld.lld ", "TEST_ENV": "armv7-linux-deb10-validate", "XZ_OPT": "-9" } @@ -1766,7 +1766,7 @@ "BIGNUM_BACKEND": "gmp", "BIN_DIST_NAME": "ghc-armv7-linux-deb10-perf", "BUILD_FLAVOUR": "perf", - "CONFIGURE_ARGS": "", + "CONFIGURE_ARGS": "LD=ld.lld ", "IGNORE_PERF_FAILURES": "all", "TEST_ENV": "armv7-linux-deb10-perf", "XZ_OPT": "-9" |