commit 94dbdf31d697a02001ffe3d834e7cd3e09585540
author Austin Schuh <austin.linux@gmail.com> Thu Apr 11 22:51:09 2024 -0700
committer Austin Schuh <austin.linux@gmail.com> Sat Apr 13 17:39:14 2024 -0700
tree 7255c7e727626df0c77a5001ad7bff9e55cb1237
parent 281a0a1f0d8f7913bbdf771957a567d598940a80

Sandbox libxml2 and switch clang to zstd compression

When trying to execute clang on a very very fresh Debian image, it can't
find libxml2.  Sandbox that too.

While we are here, zstd images extract faster than xz.  Switch over.

Change-Id: Ia196ae49223b488f5eabe28b67e6f274b3072795
Signed-off-by: Austin Schuh <austin.linux@gmail.com>

frc971/BUILD

diff --git a/frc971/BUILD b/frc971/BUILD
index 5a357ab..8f749f3 100644
--- a/frc971/BUILD
+++ b/frc971/BUILD
@@ -46,6 +46,7 @@
     ],
     data = [
         "@amd64_debian_sysroot//:sysroot_files",
+        "@clang_amd64_deps//:all",
         "@deb_zlib1g_dev_1_2_11_dfsg_2_amd64_deb_repo//file",
         "@halide_k8//:build_files",
         "@llvm_toolchain//:all-components-x86_64-linux",

frc971/halide_generator.sh

diff --git a/frc971/halide_generator.sh b/frc971/halide_generator.sh
index d6e5d41..b0d2698 100755
--- a/frc971/halide_generator.sh
+++ b/frc971/halide_generator.sh
@@ -25,10 +25,11 @@
 ZLIB1G_DEV_AMD64_DEB="$(rlocation deb_zlib1g_dev_1_2_11_dfsg_2_amd64_deb_repo/file/zlib1g-dev_1.2.11.dfsg-2_amd64.deb)"
 ZLIB1G_DEV="$(mktemp -d)"
 LLVM_TOOLCHAIN="$(dirname "$(dirname "$(rlocation llvm_k8/bin/clang)")")"
+LLVM_LIBS="$(rlocation clang_amd64_deps)/usr/lib/x86_64-linux-gnu/"
 dpkg-deb -x "${ZLIB1G_DEV_AMD64_DEB}" "${ZLIB1G_DEV}"
 TARGET=x86_64-unknown-linux-gnu
 MULTIARCH=x86_64-linux-gnu
-export LD_LIBRARY_PATH="${SYSROOT}/usr/lib:${SYSROOT}/lib:${ZLIB1G_DEV}/usr/lib/${MULTIARCH}"
+export LD_LIBRARY_PATH="${SYSROOT}/usr/lib:${SYSROOT}/lib:${ZLIB1G_DEV}/usr/lib/${MULTIARCH}:${LLVM_LIBS}"
 "${LLVM_TOOLCHAIN}/bin/clang++" \
   -fcolor-diagnostics \
   -I"${HALIDE}/include" \