summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2021-07-07 15:39:43 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-07-27 12:01:51 -0400
commit22a16b0fc0b1d6a257027cfc1881e94ae188a1cd (patch)
tree25b7b2a8af7a1ffb6da79321c8c5be45cd92ff53 /.gitlab
parent5412730e009dd30e54d13d2b1e86f7e9b9bc085f (diff)
downloadhaskell-22a16b0fc0b1d6a257027cfc1881e94ae188a1cd.tar.gz
hadrian: Install windows bindist by copying in test_hadrian
Diffstat (limited to '.gitlab')
-rwxr-xr-x.gitlab/ci.sh15
1 files changed, 12 insertions, 3 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 6a8ac0f602..8734c975f4 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -441,15 +441,24 @@ function test_hadrian() {
return
fi
+
cd _build/bindist/ghc-*/
- run ./configure --prefix="$TOP"/_build/install
- run "$MAKE" install
+ case "$(uname)" in
+ MSYS_*|MINGW*)
+ mkdir -p "$TOP"/_build/install
+ cp -a * "$TOP"/_build/install
+ ;;
+ *)
+ run ./configure --prefix="$TOP"/_build/install
+ run "$MAKE" install
+ ;;
+ esac
cd ../../../
run_hadrian \
test \
--summary-junit=./junit.xml \
- --test-compiler="$TOP"/_build/install/bin/ghc \
+ --test-compiler="$TOP/_build/install/bin/ghc$exe" \
"runtest.opts+=${RUNTEST_ARGS:-}"
}