Mention $TOOLCHAIN in install_airlock help text, and accept CSV too.

landley · Jan 12, 2025 · 006dfd8 · 006dfd8
1 parent 4ae6033
commit 006dfd8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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