summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.gitlab/ci.sh6
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" ;;