From 006dfd8d7c21bb8fac36ada7eead89d262e4dfed Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sun, 12 Jan 2025 16:16:30 -0600 Subject: [PATCH] Mention $TOOLCHAIN in install_airlock help text, and accept CSV too. --- scripts/help.txt | 4 ++-- scripts/install.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/help.txt b/scripts/help.txt index feca0a8d0..5117f9770 100644 --- a/scripts/help.txt +++ b/scripts/help.txt @@ -12,8 +12,8 @@ to show all failures. clean - Delete temporary files. distclean - Delete everything that isn't shipped. - install_airlock - Install toybox and host toolchain into $PREFIX directory - (providing $PATH for hermetic builds). + install_airlock - Install toybox and host toolchain (plus $TOOLCHAIN if any) + into $PREFIX directory, providing $PATH for hermetic builds. install_flat - Install toybox into $PREFIX directory. install - Install toybox into subdirectories of $PREFIX. uninstall_flat - Remove toybox from $PREFIX directory. diff --git a/scripts/install.sh b/scripts/install.sh index 22bb472cd..2e4fde1a2 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -106,7 +106,7 @@ done # For now symlink the host version. This list must go away by 1.0. PENDING="expr git tr bash sh gzip awk bison flex make ar" -TOOLCHAIN+=" as cc ld objdump bc gcc" +TOOLCHAIN="${TOOLCHAIN//,/ } as cc ld objdump bc gcc" # Tools needed to build packages for i in $TOOLCHAIN $PENDING $HOST_EXTRA