GitLab

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC

Commits:

fe303649

by Matthew Pickering at 2025-12-29T07:27:58+01:00

ci: Javascript don't set CROSS_EMULATOR

There is no CROSS_EMULATOR needed to run javascript binaries, so we
don't set the CROSS_EMULATOR to some dummy value.

2 changed files:

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

Changes:

.gitlab/generate-ci/gen_ci.hs

@@ -1176,7 +1176,6 @@ debian_x86 =
+   ]
    where
      validate_debian = Debian12
+-
      perfProfilingJob arch sys buildConfig =
          -- Rename the job to avoid conflicts
          rename (<> "-perf")
@@ -1309,7 +1308,7 @@ cross_jobs = [
          (validateBuilds AArch64 (Linux Debian12Wine) (winAarch64Config {llvmBootstrap = True}))
+   ]
    where
 -    javascriptConfig = (crossConfig "javascript-unknown-ghcjs" (Emulator "js-emulator") (Just "emconfigure"))
 +    javascriptConfig = (crossConfig "javascript-unknown-ghcjs" NoEmulatorNeeded (Just "emconfigure"))
                           { bignumBackend = Native }
      makeWinArmJobs = modifyJobs

.gitlab/jobs.yaml

@@ -2118,11 +2118,10 @@
        "BUILD_FLAVOUR": "validate",
        "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
        "CONFIGURE_WRAPPER": "emconfigure",
 -      "CROSS_EMULATOR": "js-emulator",
        "CROSS_STAGE": "2",
        "CROSS_TARGET": "javascript-unknown-ghcjs",
        "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
 -      "RUNTEST_ARGS": "-e config.timeout=900",
 +      "RUNTEST_ARGS": "",
        "TEST_ENV": "x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate",
        "XZ_OPT": "-9"
+     }
@@ -6292,11 +6291,10 @@
        "BUILD_FLAVOUR": "validate",
        "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
        "CONFIGURE_WRAPPER": "emconfigure",
 -      "CROSS_EMULATOR": "js-emulator",
        "CROSS_STAGE": "2",
        "CROSS_TARGET": "javascript-unknown-ghcjs",
        "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
 -      "RUNTEST_ARGS": "-e config.timeout=900",
 +      "RUNTEST_ARGS": "",
        "TEST_ENV": "x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate"
+     }
    },