Revision
586
Author
wsiegrist@apple.com
Date
2009-10-01 15:09:05 -0700 (Thu, 01 Oct 2009)

Log Message

Add a symlink for Buildroot/Developer/usr/bin/ and look for common makefiles which use xcrun

Modified Paths

Diff

Modified: trunk/darwinbuild/darwinbuild.in (585 => 586)


--- trunk/darwinbuild/darwinbuild.in	2009-10-01 22:07:58 UTC (rev 585)
+++ trunk/darwinbuild/darwinbuild.in	2009-10-01 22:09:05 UTC (rev 586)
@@ -592,7 +592,7 @@
 	buildtool="make"
 
 	# test for hybrid make-xcode project
-	uses_xcrun=$(grep -lir 'xcrun' .)
+	uses_xcrun=$(grep -Elir 'xcrun|Commands.make|BSDCommon.make|Standard.make' .)
 	if [ -n "$uses_xcrun" ]; then
 		export USE_CHROOT="NO"
 		export INSTALL_XCODE="YES"

Modified: trunk/darwinbuild/installXcode32.in (585 => 586)


--- trunk/darwinbuild/installXcode32.in	2009-10-01 22:07:58 UTC (rev 585)
+++ trunk/darwinbuild/installXcode32.in	2009-10-01 22:09:05 UTC (rev 586)
@@ -35,7 +35,10 @@
 ln -s "$PLATFORMDIR" "${PLATFORM}.platform"
 popd > /dev/null
 
+mkdir -p "${DBROOT}/BuildRoot/Developer/"
+pushd "${DBROOT}/BuildRoot/Developer/" > /dev/null
+ln -s ../usr usr
+popd > /dev/null
 
-
 echo "Completed Platform/SDK install"