Revision
556
Author
wsiegrist@apple.com
Date
2009-09-09 18:37:35 -0700 (Wed, 09 Sep 2009)

Log Message

Split out SDK boolean from chroot/buildtool logic. Add quotes to all target and configuration parameters.

Modified Paths

Diff

Modified: trunk/darwinbuild/darwinbuild.in (555 => 556)


--- trunk/darwinbuild/darwinbuild.in	2009-09-09 01:06:31 UTC (rev 555)
+++ trunk/darwinbuild/darwinbuild.in	2009-09-10 01:37:35 UTC (rev 556)
@@ -101,6 +101,7 @@
 build=""
 depsbuild=""
 CHROOTED="YES"
+USESDK="YES"
 logdeps=""
 nopatch=""
 noload=""
@@ -333,6 +334,7 @@
 		elif [ "${ARG/=*/}" == "-depsbuild" ]; then
 			depsbuild="${depsbuild} ${ARG/*=/}"
 		elif [ "$ARG" == "-nochroot" ]; then
+			USESDK="NO"
 			export CHROOTED="NO"
 		elif [ "$ARG" == "-nopatch" ]; then
 			nopatch="YES"
@@ -717,8 +719,11 @@
 export GROUP="wheel"
 
 build_string=""
+if [ $USESDK == "YES" ]; then
+	build_string="-sdk $platform"
+fi
 if [ "$buildtool" == "xcodebuild" -a "$target" != "" ]; then
-	build_string="-sdk $platform -target $target"
+	build_string="$build_string -target \"$target\""
 elif [ "$target" != "" ]; then
 	action="$target"
 fi
@@ -728,7 +733,7 @@
 # this is only applicable to xcodebuild
 #
 if [ "$buildtool" == "xcodebuild" -a "$configuration" != "" ]; then
-	build_string="$build_string -configuration $configuration"
+	build_string="$build_string -configuration \"$configuration\""
 fi
 
 ###