diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-04-30 17:07:35 -0400 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-05-04 09:13:45 +0100 |
| commit | 231a224a5ee0d75d42f98b57637c2631859b373e (patch) | |
| tree | 4292c178d08d23691fb1d5f021acf24c4a6ba562 | |
| parent | 900b347018bf6f436c4edbe997ddefd99053b81b (diff) | |
| download | haskell-wip/ghc-9.4-fwd-ports.tar.gz | |
gitlab/ci: Fix name of bootstrap compiler directorywip/ghc-9.4-fwd-ports
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 |