# HG changeset patch # User Rob Landley # Date 1249784828 18000 # Node ID 2c9f22daa8fe4d09058d2d3dfc30510e4cc211fa # Parent bb8333b7a55331278ee15ec8ed16bbee96a638d2 Allow target settings to specify BUILD_STATIC. diff -r bb8333b7a553 -r 2c9f22daa8fe sources/functions.sh --- a/sources/functions.sh Sat Aug 08 17:11:35 2009 -0500 +++ b/sources/functions.sh Sat Aug 08 21:27:08 2009 -0500 @@ -54,6 +54,10 @@ [ "$FROM_ARCH" != "$ARCH" ] && PATH="${BUILD}/cross-compiler-${FROM_ARCH}/bin:$PATH" + # Check this here because it could be set in "settings" + + [ ! -z "$BUILD_STATIC" ] && STATIC_FLAGS="--static" + return 0 } diff -r bb8333b7a553 -r 2c9f22daa8fe sources/include.sh --- a/sources/include.sh Sat Aug 08 17:11:35 2009 -0500 +++ b/sources/include.sh Sat Aug 08 21:27:08 2009 -0500 @@ -71,10 +71,8 @@ PATH="$BUILD/wrapdir" fi -[ ! -z "$BUILD_VERBOSE" ] && VERBOSITY="V=1" - # This is an if instead of && so the exit code of include.sh is reliably 0 -if [ ! -z "$BUILD_STATIC" ] +if [ ! -z "$BUILD_VERBOSE" ] then - STATIC_FLAGS="--static" + VERBOSITY="V=1" fi