aboutsummaryrefslogtreecommitdiff
path: root/scripts/make.sh
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2015-05-09 17:07:22 -0500
committerRob Landley <rob@landley.net>2015-05-09 17:07:22 -0500
commita913d92bad6550e005a3ffac71a82586042171b5 (patch)
tree00299266702e9c2abb206e17c5bd896f4358955b /scripts/make.sh
parent72cd2e07f1cea190925021472465325e72589f47 (diff)
downloadtoybox-a913d92bad6550e005a3ffac71a82586042171b5.tar.gz
Probe for -Wno-string-plus-int.
LLVM has its own nuts warnings about things that aren't wrong, but disabling them with the relevant -Wno-* warning disabling command line option drives gcc nuts because it's a command line option it doesn't recognize. (gcc 4.2.1 dies with an error. gcc 4.6 warns about it _only_ if it's warning about something else. (PICK ONE, either you warn about this or you don't, distract people from actual problems with noise about something clearly unrelated to what just changed is extra-stupid.) So just probe for it, and add the flag only if it doesn't complain about it while we're producing an unrelated warning.
Diffstat (limited to 'scripts/make.sh')
-rwxr-xr-xscripts/make.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/make.sh b/scripts/make.sh
index 56fcc7e7..7ebe148d 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -62,6 +62,7 @@ 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)"
+CFLAGS="$CFLAGS $(cat generated/cflags)"
BUILD="$(echo ${CROSS_COMPILE}${CC} $CFLAGS -I . $OPTIMIZE $GITHASH)"
FILES="$(echo lib/*.c main.c $TOYFILES)"