From b369c6e6d69d193306b4c4e61205ca2deb23286e Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 18 Dec 2020 13:59:55 -0500
Subject: [PATCH] gitlab-ci: Use gtar on FreeBSD
(cherry picked from commit 9ff26b5a384e1b9b3f865f71b818a4f960dc356a)
---
.gitlab/ci.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 102f18bada70..a4ef7dd8b1bf 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -217,7 +217,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"
@@ -268,7 +268,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
@@ -469,12 +469,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" ;;
--
GitLab