GitLab

Sven Tennie pushed to branch wip/supersven/correctly_propagate_host-build-target at Glasgow Haskell Compiler / GHC

Commits:

94a9852e

by Sven Tennie at 2026-04-06T17:23:12+02:00

ci: Define USER_CONF_CC_OPTS_STAGE2 for aarch64/mingw

ghc-toolchain doesn't see $CONF_CC_OPTS_STAGE2 when the bindist gets
configured. So, the hack to override the compiler gets lost.

2 changed files:

.gitlab/generate-ci/gen_ci.hs
.gitlab/jobs.yaml

Changes:

.gitlab/generate-ci/gen_ci.hs

@@ -1316,6 +1316,13 @@ cross_jobs = [
            -- unexpected triple.
          . setVariable "CFLAGS" cflags
          . setVariable "CONF_CC_OPTS_STAGE2" cflags
 +          -- For bindists `$USER_CONF_CC_OPTS_STAGE2` is not automatically set
 +          -- to `$CONF_CC_OPTS_STAGE2`. But, we still have to deal with the hack
 +          -- mentioned in the previous comment.
 +          --
 +          -- TODO: It would be nice to get rid of this hack. This would probably
 +          -- involve setting the toolchain up in a different way.
 +        . setVariable "USER_CONF_CC_OPTS_STAGE2" cflags
          ) where
              llvm_prefix = "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-"
              cflags = "-fuse-ld=" ++ llvm_prefix ++ "ld --rtlib=compiler-rt"

.gitlab/jobs.yaml

@@ -331,6 +331,7 @@
        "STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
        "STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
        "TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate",
 +      "USER_CONF_CC_OPTS_STAGE2": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
        "WindresCmd": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-windres"
+     }
    },
@@ -412,6 +413,7 @@
        "STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
        "STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
        "TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate+llvm",
 +      "USER_CONF_CC_OPTS_STAGE2": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
        "WindresCmd": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-windres"
+     }
    },
@@ -1123,6 +1125,7 @@
        "STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
        "STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
        "TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate",
 +      "USER_CONF_CC_OPTS_STAGE2": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
        "WindresCmd": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-windres",
        "XZ_OPT": "-9"
+     }
@@ -1205,6 +1208,7 @@
        "STRINGS": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strings",
        "STRIP": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-strip",
        "TEST_ENV": "aarch64-linux-deb12-wine-int_native-cross_aarch64-unknown-mingw32-validate+llvm",
 +      "USER_CONF_CC_OPTS_STAGE2": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
        "WindresCmd": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-windres",
        "XZ_OPT": "-9"
+     }