Sven Tennie pushed to branch wip/supersven/hadrian-cross-stage3 at Glasgow Haskell Compiler / GHC
Commits:
-
106e2b54
by GHC GitLab CI at 2026-06-28T11:41:53+02:00
2 changed files:
Changes:
| ... | ... | @@ -1311,7 +1311,9 @@ cross_jobs = [ |
| 1311 | 1311 | , addValidateRule RiscV (validateBuilds Amd64 (Linux Debian13Riscv) (stage2CrossConfig "riscv64-linux-gnu" (Emulator "qemu-riscv64 -L /usr/riscv64-linux-gnu") Nothing))
|
| 1312 | 1312 | |
| 1313 | 1313 | -- x86_64 (build) -> riscv (host/target)
|
| 1314 | - , addValidateRule RiscV (validateBuilds Amd64 (Linux Debian13Riscv) (stage3CrossConfig "riscv64-linux-gnu" "riscv64-linux" (Emulator "qemu-riscv64 -L /usr/riscv64-linux-gnu") Nothing))
|
|
| 1314 | + -- Skip testing in ci.sh by setting CROSS_EMULATOR=NOT_SET
|
|
| 1315 | + -- (we're creating target binaries which won't run on the build arch)
|
|
| 1316 | + , addValidateRule RiscV (validateBuilds Amd64 (Linux Debian13Riscv) (stage3CrossConfig "riscv64-linux-gnu" "riscv64-linux" NoEmulator Nothing))
|
|
| 1315 | 1317 | |
| 1316 | 1318 | -- x86_64 -> loongarch64
|
| 1317 | 1319 | , addValidateRule LoongArch64 (validateBuilds Amd64 (Linux Ubuntu2404LoongArch64) (stage2CrossConfig "loongarch64-linux-gnu" (Emulator "qemu-loongarch64 -L /usr/loongarch64-linux-gnu") Nothing))
|
| ... | ... | @@ -2819,11 +2819,11 @@ |
| 2819 | 2819 | "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-stage3-validate",
|
| 2820 | 2820 | "BUILD_FLAVOUR": "validate",
|
| 2821 | 2821 | "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
|
| 2822 | - "CROSS_EMULATOR": "qemu-riscv64 -L /usr/riscv64-linux-gnu",
|
|
| 2822 | + "CROSS_EMULATOR": "NOT_SET",
|
|
| 2823 | 2823 | "CROSS_STAGE": "3",
|
| 2824 | 2824 | "CROSS_TARGET": "riscv64-linux-gnu",
|
| 2825 | 2825 | "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
|
| 2826 | - "RUNTEST_ARGS": "-e config.timeout=900",
|
|
| 2826 | + "RUNTEST_ARGS": "",
|
|
| 2827 | 2827 | "TEST_ENV": "x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-stage3-validate",
|
| 2828 | 2828 | "XZ_OPT": "-9"
|
| 2829 | 2829 | }
|
| ... | ... | @@ -6799,11 +6799,11 @@ |
| 6799 | 6799 | "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-stage3-validate",
|
| 6800 | 6800 | "BUILD_FLAVOUR": "validate",
|
| 6801 | 6801 | "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
|
| 6802 | - "CROSS_EMULATOR": "qemu-riscv64 -L /usr/riscv64-linux-gnu",
|
|
| 6802 | + "CROSS_EMULATOR": "NOT_SET",
|
|
| 6803 | 6803 | "CROSS_STAGE": "3",
|
| 6804 | 6804 | "CROSS_TARGET": "riscv64-linux-gnu",
|
| 6805 | 6805 | "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
|
| 6806 | - "RUNTEST_ARGS": "-e config.timeout=900",
|
|
| 6806 | + "RUNTEST_ARGS": "",
|
|
| 6807 | 6807 | "TEST_ENV": "x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-stage3-validate"
|
| 6808 | 6808 | }
|
| 6809 | 6809 | },
|