| ... |
... |
@@ -619,7 +619,7 @@ function make_install_destdir() { |
|
619
|
619
|
|
|
620
|
620
|
# install the binary distribution in directory $1 to $2.
|
|
621
|
621
|
function install_bindist() {
|
|
622
|
|
- start_section install-bindist "Install bindist"
|
|
|
622
|
+ start_section install-bindist "Install bindist ($1 -> $2)"
|
|
623
|
623
|
case "${CONFIGURE_WRAPPER:-}" in
|
|
624
|
624
|
emconfigure) source "$EMSDK/emsdk_env.sh" ;;
|
|
625
|
625
|
*) ;;
|
| ... |
... |
@@ -648,7 +648,26 @@ function install_bindist() { |
|
648
|
648
|
end_section install-bindist
|
|
649
|
649
|
}
|
|
650
|
650
|
|
|
|
651
|
+function find_bindist_tar() {
|
|
|
652
|
+ local tar_files
|
|
|
653
|
+ tar_files=( *ghc*.tar.xz )
|
|
|
654
|
+ if [[ ${#tar_files[@]} -gt 0 ]]; then
|
|
|
655
|
+ bindist_tar="${tar_files[0]}"
|
|
|
656
|
+ else
|
|
|
657
|
+ unset bindist_tar
|
|
|
658
|
+ fi
|
|
|
659
|
+}
|
|
|
660
|
+
|
|
651
|
661
|
function test_hadrian() {
|
|
|
662
|
+
|
|
|
663
|
+ find_bindist_tar
|
|
|
664
|
+ dist_dir="_build/bindist"
|
|
|
665
|
+
|
|
|
666
|
+ if [ -n "$bindist_tar" ]; then
|
|
|
667
|
+ mkdir -p "$dist_dir"
|
|
|
668
|
+ tar -xf "$bindist_tar" -C "$dist_dir"
|
|
|
669
|
+ fi
|
|
|
670
|
+
|
|
652
|
671
|
check_msys2_deps _build/stage1/bin/ghc --version
|
|
653
|
672
|
check_release_build
|
|
654
|
673
|
|
| ... |
... |
@@ -680,7 +699,7 @@ function test_hadrian() { |
|
680
|
699
|
elif [ -n "${CROSS_EMULATOR:-}" ] && [[ "${CROSS_TARGET:-}" != *"wasm"* ]]; then
|
|
681
|
700
|
local instdir="$TOP/_build/install"
|
|
682
|
701
|
local test_compiler="$instdir/bin/${cross_prefix}ghc$exe"
|
|
683
|
|
- install_bindist _build/bindist/ghc-*/ "$instdir"
|
|
|
702
|
+ install_bindist $dist_dir/ghc-*/ "$instdir"
|
|
684
|
703
|
echo 'main = putStrLn "hello world"' > expected
|
|
685
|
704
|
run "$test_compiler" -package ghc "$TOP/.gitlab/hello.hs" -o hello
|
|
686
|
705
|
|
| ... |
... |
@@ -714,7 +733,7 @@ function test_hadrian() { |
|
714
|
733
|
else
|
|
715
|
734
|
local instdir="$TOP/_build/install"
|
|
716
|
735
|
local test_compiler="$instdir/bin/${cross_prefix}ghc$exe"
|
|
717
|
|
- install_bindist _build/bindist/ghc-*/ "$instdir"
|
|
|
736
|
+ install_bindist $dist_dir/ghc-*/ "$instdir"
|
|
718
|
737
|
|
|
719
|
738
|
if [[ "${CI_JOB_NAME}" != *"windows"* ]] && [ -z "${CROSS_TARGET:-}" ]
|
|
720
|
739
|
then
|