diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-04-30 17:07:35 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-05-04 16:16:48 -0400 |
| commit | 27f9aab340ab9be8c2018e8f3c71c9c18337428b (patch) | |
| tree | 0c479694faf31f781ac4a9ae4c4a88a463e0e2bf | |
| parent | 0032dc383d67ff164d0cfbb717e10f1275547e4c (diff) | |
| download | haskell-27f9aab340ab9be8c2018e8f3c71c9c18337428b.tar.gz | |
gitlab/ci: Fix name of bootstrap compiler directory
Windows binary distributions built with Hadrian have a target platform
suffix in the name of their root directory. Teach `ci.sh` about this
fact.
(cherry picked from commit df5752f39671f6d04d8cd743003469ae5eb67235)
| -rwxr-xr-x | .gitlab/ci.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index f04b3861e0..d9e48129a8 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -283,10 +283,10 @@ function fetch_ghc() { $TAR -xJf ghc.tar.xz || fail "failed to extract GHC binary distribution" case "$(uname)" in MSYS_*|MINGW*) - cp -r "ghc-${GHC_VERSION}"/* "$toolchain" + cp -r ghc-${GHC_VERSION}*/* "$toolchain" ;; *) - pushd "ghc-${GHC_VERSION}" + pushd "ghc-${GHC_VERSION}*" ./configure --prefix="$toolchain" "$MAKE" install popd |