Sven Tennie pushed to branch wip/supersven/cross-testsuite at Glasgow Haskell Compiler / GHC
Commits:
-
fd9c75a0
by Sven Tennie at 2026-05-30T23:49:55+02:00
1 changed file:
Changes:
| ... | ... | @@ -709,7 +709,27 @@ function test_hadrian() { |
| 709 | 709 | # > main = putStrLn "hello world"
|
| 710 | 710 | run diff -w expected actual
|
| 711 | 711 | |
| 712 | - EXTRA_HC_OPTS="${EXTRA_HC_OPTS:+${EXTRA_HC_OPTS} }-fexternal-interpreter"
|
|
| 712 | + if [[ "${CROSS_EMULATOR:-}" == qemu-* ]]; then
|
|
| 713 | + cat > "${TOP}/tmp/iserv_main.hs" <<'EOF'
|
|
| 714 | +import GHCi.Server (defaultServer)
|
|
| 715 | +main :: IO ()
|
|
| 716 | +main = defaultServer
|
|
| 717 | +EOF
|
|
| 718 | + local iserv_bin="${TOP}/tmp/ghc-iserv-cross"
|
|
| 719 | + run "${test_compiler}" \
|
|
| 720 | + -package ghci \
|
|
| 721 | + -threaded \
|
|
| 722 | + -optl-Wl,--export-dynamic \
|
|
| 723 | + "${TOP}/tmp/iserv_main.hs" \
|
|
| 724 | + -o "${iserv_bin}"
|
|
| 725 | + local iserv_wrapper="${TOP}/tmp/iserv-wrapper.sh"
|
|
| 726 | + cat > "${iserv_wrapper}" <<EOF
|
|
| 727 | +#!/usr/bin/env bash
|
|
| 728 | +exec ${CROSS_EMULATOR} "${iserv_bin}" "\$@"
|
|
| 729 | +EOF
|
|
| 730 | + chmod +x "${iserv_wrapper}"
|
|
| 731 | + export EXTRA_HC_OPTS="${EXTRA_HC_OPTS:+${EXTRA_HC_OPTS} }-fexternal-interpreter -pgmi ${iserv_wrapper}"
|
|
| 732 | + fi
|
|
| 713 | 733 | run_hadrian \
|
| 714 | 734 | test \
|
| 715 | 735 | --summary-junit=./junit.xml \
|