[llvm-commits] [llvm] r93878 - /llvm/trunk/utils/buildit/build_llvm
Bob Wilson
bob.wilson at apple.com
Tue Jan 19 08:42:11 PST 2010
Author: bwilson
Date: Tue Jan 19 10:42:10 2010
New Revision: 93878
URL: http://llvm.org/viewvc/llvm-project?rev=93878&view=rev
Log:
The change in r90189 adds a link in a directory outside the iPhone platform
directory when building the llvmCore_Embedded project. Fix this by putting
the iPhone platform directory into DEST_DIR instead of DEST_ROOT. I also
noticed what appears to be an unintentional use of DEVELOPER_BIN instead of
DEVELOPER_DIR, so I fixed that and changed to use DEVELOPER_DIR in some places
that were hardcoded to "Developer". Finally, the other changes here allowed
some refactoring and simplification, which I have done.
Modified:
llvm/trunk/utils/buildit/build_llvm
Modified: llvm/trunk/utils/buildit/build_llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/buildit/build_llvm?rev=93878&r1=93877&r2=93878&view=diff
==============================================================================
--- llvm/trunk/utils/buildit/build_llvm (original)
+++ llvm/trunk/utils/buildit/build_llvm Tue Jan 19 10:42:10 2010
@@ -57,25 +57,20 @@
echo DARWIN_VERS = $DARWIN_VERS
if [ "x$RC_ProjectName" = "xllvmCore_Embedded" ]; then
- DT_HOME=$DEST_DIR/Developer/Platforms/iPhoneOS.platform/Developer/usr
- DEST_ROOT="/Developer/Platforms/iPhoneOS.platform/Developer$DEST_ROOT"
-elif [ "x$RC_ProjectName" = "xllvmCore_EmbeddedHosted" ]; then
- DT_HOME=$DEST_DIR/usr
- DEST_ROOT="/Developer$DEST_ROOT"
+ DEST_DIR="$DEST_DIR/Developer/Platforms/iPhoneOS.platform"
+ mkdir -p "$DEST_DIR"
+fi
+
+DEVELOPER_DIR="${DEVELOPER_DIR-Developer}"
+if [ "x$RC_ProjectName" = "xllvmCore_EmbeddedHosted" ]; then
+ DT_HOME="$DEST_DIR/usr"
HOST_SDKROOT=$SDKROOT
else
- DT_HOME=$DEST_DIR/Developer/usr
- DEST_ROOT="/Developer$DEST_ROOT"
-fi
-if [ "x$DEVELOPER_BIN" != "x" ]; then
- if [ "x$RC_ProjectName" = "xllvmCore_Embedded" ]; then
- DT_HOME=$DEST_DIR/Developer/Platforms/iPhoneOS.platform/$DEVELOPER_DIR/usr
- else
- DT_HOME=$DEST_DIR/$DEVELOPER_DIR/usr
- fi
- DEST_ROOT="/$DEVELOPER_DIR$DEST_ROOT"
+ DT_HOME="$DEST_DIR/$DEVELOPER_DIR/usr"
fi
+DEST_ROOT="/$DEVELOPER_DIR$DEST_ROOT"
+
################################################################################
# Run the build.
@@ -350,7 +345,7 @@
cd $DEST_DIR
mkdir -p ./usr/lib/
cd usr/lib
-ln -s ../../Developer/usr/lib/libLTO.dylib ./libLTO.dylib
+ln -s ../../$DEVELOPER_DIR/usr/lib/libLTO.dylib ./libLTO.dylib
################################################################################
# w00t! Done!
More information about the llvm-commits
mailing list