From 7da9e26340bb4920d65273c00c118c4acc1679a6 Mon Sep 17 00:00:00 2001 From: phlax Date: Tue, 4 Feb 2025 17:56:51 +0000 Subject: [PATCH] bazel/website: Prefer `gtar` over `tar` to fix macos build (#2552) Signed-off-by: Ryan Northey --- bazel/website/macros.bzl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/bazel/website/macros.bzl b/bazel/website/macros.bzl index 69c3eb0e5..64089b2cc 100644 --- a/bazel/website/macros.bzl +++ b/bazel/website/macros.bzl @@ -90,7 +90,14 @@ def static_website( EXCLUDES="%s" %s - tar "$${DECOMPRESS_ARGS}" -xf $$SOURCE + # prefer gtar over tar and unbreak macs + if command -v gtar >/dev/null 2>&1; then + TAR_COMMAND=$$(which gtar) + else + TAR_COMMAND=$$(which tar) + fi + + $$TAR_COMMAND -xf $$SOURCE "$${DECOMPRESS_ARGS}" while IFS= read -r CMD; do $$CMD @@ -98,7 +105,7 @@ def static_website( $$GENERATOR "$$CONTENT" - tar cfh $@ $$EXCLUDES -C "$$OUTPUT" . + $$TAR_COMMAND cfh $@ $$EXCLUDES -C "$$OUTPUT" . """ % (name_sources, decompressor_args, generator, content_path, output_path, mapping_commands, exclude_args, url), outs = [name_website_tarball], srcs = extra_srcs,