Serge S. Gulin pushed to branch wip/T25974 at Glasgow Haskell Compiler / GHC
Commits:
-
815147bf
by Serge S. Gulin at 2025-05-10T16:47:11+04:00
2 changed files:
Changes:
| ... | ... | @@ -869,6 +869,10 @@ job arch opsys buildConfig = NamedJob { name = jobName, jobInfo = Job {..} } |
| 869 | 869 | , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh configure"
|
| 870 | 870 | -- We have to trigger cabal build in an independent way to mitigate Wine hangs at MSYS2/Arm64EC
|
| 871 | 871 | , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l -c './hadrian/build-cabal clean'"
|
| 872 | + -- We use "--enable-distro-toolchain" due of TOOLCHAIN_SOURCE="env", so we have to manually copy
|
|
| 873 | + -- bootstrap's compiler mingw into `_build` because binary-dist-dir requires it at Windows.
|
|
| 874 | + -- After './hadrian/build-cabal clean' we have to recreate the build root directory.
|
|
| 875 | + , "mkdir ./_build && cp -r ../.wine/drive_c/msys64/opt/ghc-bootstrap/mingw ./_build/"
|
|
| 872 | 876 | , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh build_hadrian"
|
| 873 | 877 | , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh test_hadrian"
|
| 874 | 878 | ]
|
| ... | ... | @@ -523,6 +523,7 @@ |
| 523 | 523 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh setup",
|
| 524 | 524 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh configure",
|
| 525 | 525 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l -c './hadrian/build-cabal clean'",
|
| 526 | + "mkdir ./_build && cp -r ../.wine/drive_c/msys64/opt/ghc-bootstrap/mingw ./_build/",
|
|
| 526 | 527 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh build_hadrian",
|
| 527 | 528 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh test_hadrian"
|
| 528 | 529 | ],
|
| ... | ... | @@ -1281,6 +1282,7 @@ |
| 1281 | 1282 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh setup",
|
| 1282 | 1283 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh configure",
|
| 1283 | 1284 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l -c './hadrian/build-cabal clean'",
|
| 1285 | + "mkdir ./_build && cp -r ../.wine/drive_c/msys64/opt/ghc-bootstrap/mingw ./_build/",
|
|
| 1284 | 1286 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh build_hadrian",
|
| 1285 | 1287 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh test_hadrian"
|
| 1286 | 1288 | ],
|