[darwinbuild-changes] [588] trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Oct 1 16:33:12 PDT 2009
Revision: 588
http://trac.macosforge.org/projects/darwinbuild/changeset/588
Author: wsiegrist at apple.com
Date: 2009-10-01 16:33:12 -0700 (Thu, 01 Oct 2009)
Log Message:
-----------
Allow access to /usr/share/xcode for xcode-select and do not perform redirection when -nochroot is specified
Modified Paths:
--------------
trunk/darwinbuild/darwinbuild.in
trunk/darwintrace/darwintrace.c
Modified: trunk/darwinbuild/darwinbuild.in
===================================================================
--- trunk/darwinbuild/darwinbuild.in 2009-10-01 22:53:31 UTC (rev 587)
+++ trunk/darwinbuild/darwinbuild.in 2009-10-01 23:33:12 UTC (rev 588)
@@ -586,14 +586,17 @@
if [ -n "$numfiles" ]; then
buildtool="xcodebuild"
# we use a platform/sdk instead of chrooting for Xcode projects
- export USE_CHROOT="NO"
- export INSTALL_XCODE="YES"
+ # but allow -nochroot to disable Xcode integration
+ if [ $USE_CHROOT == "YES" ]; then
+ export USE_CHROOT="NO"
+ export INSTALL_XCODE="YES"
+ fi
else
buildtool="make"
# test for hybrid make-xcode project
uses_xcrun=$(grep -Elir 'xcrun|Commands.make|BSDCommon.make|Standard.make' .)
- if [ -n "$uses_xcrun" ]; then
+ if [ -n "$uses_xcrun" -a $USE_CHROOT == "YES" ]; then
export USE_CHROOT="NO"
export INSTALL_XCODE="YES"
fi
Modified: trunk/darwintrace/darwintrace.c
===================================================================
--- trunk/darwintrace/darwintrace.c 2009-10-01 22:53:31 UTC (rev 587)
+++ trunk/darwintrace/darwintrace.c 2009-10-01 23:33:12 UTC (rev 588)
@@ -73,6 +73,7 @@
"/Volumes/BuildRoot_",
"/usr/bin/xcrun",
"/usr/bin/xcode",
+ "/usr/share/xcode",
"/var/folders/",
"/var/tmp/",
"/.vol/",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20091001/7501d707/attachment-0001.html>
More information about the darwinbuild-changes
mailing list