Skip to content
Permalink
Browse files

Allow access to /usr/share/xcode for xcode-select and do not perform …

…redirection when -nochroot is specified

git-svn-id: https://svn.macosforge.org/repository/darwinbuild/trunk@588 10a61168-4876-4dac-953b-31e694342555
  • Loading branch information
wsiegrist@apple.com
wsiegrist@apple.com committed Oct 1, 2009
1 parent c78998d commit d65f80cf713b9b92770481fa1065f9efda1edf4e
Showing with 7 additions and 3 deletions.
  1. +6 −3 darwinbuild/darwinbuild.in
  2. +1 −0 darwintrace/darwintrace.c
@@ -586,14 +586,17 @@ numfiles=$(echo *.pbxproj *.pbproj *.xcode *.xcodeproj 2> /dev/null )
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
@@ -73,6 +73,7 @@ static const char *__redirect_exceptions[] = {"/Developer/Library/PrivateFramewo
"/Volumes/BuildRoot_",
"/usr/bin/xcrun",
"/usr/bin/xcode",
"/usr/share/xcode",
"/var/folders/",
"/var/tmp/",
"/.vol/",

0 comments on commit d65f80c

Please sign in to comment.
You can’t perform that action at this time.