diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-12-18 13:59:55 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-12-18 13:59:55 -0500 |
| commit | 9ff26b5a384e1b9b3f865f71b818a4f960dc356a (patch) | |
| tree | b69cb484a60f078f1ec76318a7bf21305c09680e | |
| parent | 659fcb14937e60510e3eea4c1211ea117419905b (diff) | |
| download | haskell-wip/freebsd-tar.tar.gz | |
gitlab-ci: Use gtar on FreeBSDwip/freebsd-tar
| -rwxr-xr-x | .gitlab/ci.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 457db1c0fa..618430f6dd 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -236,7 +236,7 @@ function fetch_ghc() { url="https://downloads.haskell.org/~ghc/${GHC_VERSION}/ghc-${GHC_VERSION}-${boot_triple}.tar.xz" info "Fetching GHC binary distribution from $url..." curl "$url" > ghc.tar.xz || fail "failed to fetch GHC binary distribution" - tar -xJf ghc.tar.xz || fail "failed to extract GHC binary distribution" + $TAR -xJf ghc.tar.xz || fail "failed to extract GHC binary distribution" case "$(uname)" in MSYS_*|MINGW*) cp -r "ghc-${GHC_VERSION}"/* "$toolchain" @@ -287,7 +287,7 @@ function fetch_cabal() { esac echo "Fetching cabal-install from $cabal_url" curl "$cabal_url" > cabal.tar.xz - tar -xJf cabal.tar.xz + $TAR -xJf cabal.tar.xz mv cabal "$toolchain/bin" ;; esac @@ -536,12 +536,14 @@ esac # Platform-specific environment initialization MAKE="make" +TAR="tar" case "$(uname)" in MSYS_*|MINGW*) mingw_init ;; Darwin) boot_triple="x86_64-apple-darwin" ;; FreeBSD) boot_triple="x86_64-portbld-freebsd" MAKE="gmake" + TAR="gtar" ;; Linux) ;; *) fail "uname $(uname) is not supported" ;; |