diff options
| author | Rob Landley <rob@landley.net> | 2014-09-11 20:50:10 -0500 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2014-09-11 20:50:10 -0500 |
| commit | 8aa87ab9b4ee68eec75af26d550fbcfb732d660f (patch) | |
| tree | ecf460c87cedb98168dad84a162cc5ff52d2efff | |
| parent | 09af6a7d3f5076b52a89a4be5cebebdb9c9d00c8 (diff) | |
| download | toybox-8aa87ab9b4ee68eec75af26d550fbcfb732d660f.tar.gz | |
Create a generated/build.sh with a single compiler command line to rebuild the toybox_unstripped binary using the existing generated/*.h files.
This way we can snapshot the generated/*.{h,sh} from a defconfig build into
a "shipped" directory or something, and then people can maybe build on crazy
crippled environments like pcbsd that haven't got gmake and put bash under
/usr/local so none of the #!/scripts can find it. This solves at least
part of the "toybox can build with itself but you need to build toybox first
to have the tools to run the build scripts" problem.
Next up: work out the minimal config to provide the build tools needed
to run an actual build. (This should, eventually, include a "make" command
if freebsd's kernel is going to refuse to build with netbsd's "make" and
we don't just write off the whole thing as crazy. But it probably shouldn't
include commands that #include <linux/*.h> if we are trying to make that work.)
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | scripts/make.sh | 19 |
2 files changed, 17 insertions, 4 deletions
@@ -41,7 +41,7 @@ uninstall: scripts/install.sh --long --uninstall clean:: - rm -rf toybox toybox_unstripped testdir \ + rm -rf toybox toybox_unstripped testdir generated/build.sh \ .singleconfig .singleconfig.old generated/obj \ generated/Config.* generated/*.h generated/*.dat \ generated/instlist generated/mkflags generated/config2help diff --git a/scripts/make.sh b/scripts/make.sh index 34c1db51..049bc4d9 100755 --- a/scripts/make.sh +++ b/scripts/make.sh @@ -166,12 +166,25 @@ do_loudly() "$@" } -BUILD="${CROSS_COMPILE}${CC} $CFLAGS -I . $OPTIMIZE" -FILES="$(ls lib/*.c) main.c $TOYFILES" -LINK="$LDOPTIMIZE -o toybox_unstripped -Wl,--as-needed $(cat generated/optlibs.dat)" +BUILD="$(echo ${CROSS_COMPILE}${CC} $CFLAGS -I . $OPTIMIZE)" +FILES="$(echo lib/*.c main.c $TOYFILES)" +LINK="$(echo $LDOPTIMIZE -o toybox_unstripped -Wl,--as-needed $(cat generated/optlibs.dat))" # This is a parallel version of: do_loudly $BUILD $FILES $LINK || exit 1 +# Write a canned build line for use on crippled build machines. +( + echo "#!/bin/sh" + echo + echo "BUILD=\"$BUILD\"" + echo + echo "LINK=\"$LINK\"" + echo + echo "FILES=\"$FILES\"" + echo + echo '$BUILD $FILES $LINK' +) > generated/build.sh && chmod +x generated/build.sh || echo 1 + rm -rf generated/obj && mkdir -p generated/obj || exit 1 PENDING= for i in $FILES |