Move guts of "make change" to scripts/change.sh, don't try to build sh or help standalone.

sh builtin commands need multiplexer, help describes other enabled commands.

2 files changed, 21 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 2c9a857f..d2919e7d 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ toybox toybox_unstripped: toybox_stuff
 	scripts/make.sh
 
 .PHONY: clean distclean baseline bloatcheck install install_flat \
-	uinstall uninstall_flat test tests help toybox_stuff
+	uinstall uninstall_flat test tests help toybox_stuff change
 
 include kconfig/Makefile
 
@@ -46,14 +46,7 @@ uninstall:
 	scripts/install.sh --long --uninstall
 
 change:
-	@NOBUILD=1 scripts/make.sh > /dev/null&& \
-	$(HOSTCC) -I . scripts/install.c -o generated/instlist && \
-	export PREFIX=$${PREFIX:-change/} && \
-	mkdir -p "$$PREFIX" && \
-	for i in $$(generated/instlist); \
-		do echo -n "$$i " && \
-		scripts/single.sh $$i > /dev/null || touch $$PREFIX/$${i}.bad; \
-	done
+	scripts/change.sh
 
 clean::
 	rm -rf toybox toybox_unstripped generated change .singleconfig*
diff --git a/scripts/change.sh b/scripts/change.sh
new file mode 100755
index 00000000..8b8ab92b
--- /dev/null
+++ b/scripts/change.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# build each command as a standalone executable
+
+NOBUILD=1 scripts/make.sh > /dev/null &&
+${HOSTCC:-cc} -I . scripts/install.c -o generated/instlist &&
+export PREFIX=${PREFIX:-change/} &&
+mkdir -p "$PREFIX" || exit 1
+
+# Build all the commands standalone except:
+
+# sh - shell builtins like "cd" and "exit" need the multiplexer
+# help - needs to know what other commands are enabled (use command --help)
+
+for i in $(generated/instlist | egrep -vw "sh|help")
+do
+  echo -n "$i " &&
+  scripts/single.sh $i > /dev/null || touch $PREFIX/${i}.bad
+done