Revision
554
Author
wsiegrist@apple.com
Date
2009-09-04 14:56:08 -0700 (Fri, 04 Sep 2009)

Log Message

Move the platform variable outside of the installXcode block so we always read .build/platform, even when Xcode is already installed

Modified Paths

Diff

Modified: trunk/darwinbuild/darwinbuild.in (553 => 554)


--- trunk/darwinbuild/darwinbuild.in	2009-09-04 21:55:18 UTC (rev 553)
+++ trunk/darwinbuild/darwinbuild.in	2009-09-04 21:56:08 UTC (rev 554)
@@ -655,7 +655,6 @@
 	if [ "$buildtool" == "xcodebuild" -a ! -f "$receipts/xcodebuild" ]; then
 		echo "*** Installing Xcode Tools ..."
 		"$DATADIR/installXcode" "$BuildRoot"
-		platform=$(cat "${DARWIN_BUILDROOT}/.build/platform")
 		touch "$receipts/xcodebuild"
 	fi
 
@@ -665,6 +664,10 @@
 
 fi
 
+if [ "$buildtool" == "xcodebuild" ]; then
+	platform=$(cat "${DARWIN_BUILDROOT}/.build/platform")
+fi
+
 ###
 ### Read in the environment
 ###