changeset 798:2c9f22daa8fe

Allow target settings to specify BUILD_STATIC.
author Rob Landley <rob@landley.net>
date Sat, 08 Aug 2009 21:27:08 -0500
parents bb8333b7a553
children 2ba6cce8c294
files sources/functions.sh sources/include.sh
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
 }
 
--- 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