From 679146ec3510c6d3eb0cd6385b7640b02b44894b Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sat, 12 Feb 2022 02:46:37 -0600 Subject: [PATCH] Fix generated/build.sh --- scripts/make.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/make.sh b/scripts/make.sh index 2abb5169..3c6b4f1e 100755 --- a/scripts/make.sh +++ b/scripts/make.sh @@ -62,11 +62,10 @@ fi [ -d ".git" ] && GITHASH="$(git describe --tags --abbrev=12 2>/dev/null)" [ ! -z "$GITHASH" ] && GITHASH="-DTOYBOX_VERSION=\"$GITHASH\"" TOYFILES="$($SED -n 's/^CONFIG_\([^=]*\)=.*/\1/p' "$KCONFIG_CONFIG" | xargs | tr ' [A-Z]' '|[a-z]')" -TOYFILES="$(egrep -l "TOY[(]($TOYFILES)[ ,]" toys/*/*.c)" +TOYFILES="main.c $(egrep -l "TOY[(]($TOYFILES)[ ,]" toys/*/*.c | xargs)" CFLAGS="$CFLAGS $(cat generated/cflags)" BUILD="$(echo ${CROSS_COMPILE}${CC} $CFLAGS -I . $OPTIMIZE $GITHASH)" LIBFILES="$(ls lib/*.c)" -TOYFILES="main.c $TOYFILES" if [ "${TOYFILES/pending//}" != "$TOYFILES" ] then @@ -77,12 +76,12 @@ genbuildsh() { # Write a canned build line for use on crippled build machines. - echo -e "#!/bin/sh\n\nPATH='\$PATH'\n\nBUILD='\$BUILD'\n\nLINK='\$LINK'\n" - echo -e "FILES='$LIBFILES $TOYFILES'\n\n\$BUILD \$FILES \$LINK" + echo -e "#!/bin/sh\n\nPATH='$PATH'\nBUILD='$BUILD'\nLINK='$LINK'\n" + echo -e "\$BUILD lib/*.c $TOYFILES \$LINK" } -if ! cmp -s <(genbuildsh 2>/dev/null | head -n 6 ; echo LINK="'"$LDOPTIMIZE $LDFLAGS) \ - <(head -n 7 generated/build.sh 2>/dev/null | $SED '7s/ -o .*//') +if ! cmp -s <(genbuildsh 2>/dev/null | head -n 4 ; echo LINK="'"$LDOPTIMIZE $LDFLAGS) \ + <(head -n 5 generated/build.sh 2>/dev/null | $SED '5s/ -o .*//') then echo -n "Library probe" -- 2.39.2