Revision: 387 http://trac.macosforge.org/projects/darwinbuild/changeset/387 Author: wsiegrist@apple.com Date: 2008-09-18 18:22:00 -0700 (Thu, 18 Sep 2008) Log Message: ----------- Change the symlinking of compilers to be a generic step to symlink any binaries that Xcode wants to use that are open source Modified Paths: -------------- trunk/darwinbuild/installXcode31 Modified: trunk/darwinbuild/installXcode31 =================================================================== --- trunk/darwinbuild/installXcode31 2008-09-19 00:53:36 UTC (rev 386) +++ trunk/darwinbuild/installXcode31 2008-09-19 01:22:00 UTC (rev 387) @@ -18,6 +18,12 @@ /Developer/Platforms/MacOSX.platform \ /Developer/Makefiles/pbx_jamfiles) +BINSYMLINKS=( \ + gcc \ + gcc-3.3 \ + gcc-4.0 \ + strip) + JAMFILES="/Developer/Makefiles/pbx_jamfiles" XCODERESOURCES="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/" @@ -31,15 +37,20 @@ mkdir -p "$BUILDROOT" -SymlinkCompilers() { - echo "Creating compiler symlinks ..." - COMPILER_DIR="$BUILDROOT/XCD/loper/usr/bin/" - mkdir -p $COMPILER_DIR - pushd $COMPILER_DIR > /dev/null +### +### Symlink opensource binaries used by Xcode to /usr/bin +### so the opensource-built binary can be used instead +### of the one that ships with Xcode +### +SymlinkBinaries() { + echo "Creating symlinks for binaries ..." + BIN_DIR="$BUILDROOT/XCD/loper/usr/bin/" + mkdir -p $BIN_DIR + pushd $BIN_DIR > /dev/null - ln -s /usr/bin/gcc gcc - ln -s /usr/bin/gcc-3.3 gcc-3.3 - ln -s /usr/bin/gcc-4.0 gcc-4.0 + for B in "${BINSYMLINKS[@]}"; do + ln -s "/usr/bin/$B" "$B" + done popd > /dev/null } @@ -185,7 +196,7 @@ AppendExtraFiles GenerateFileNames CopyFiles -SymlinkCompilers +SymlinkBinaries popd > /dev/null