[llvm-branch-commits] [llvm-branch] r105939 - in /llvm/branches/Apple/Troughton: ./ utils/buildit/build_llvm

[Bob Wilson]

Author: bwilson
Date: Mon Jun 14 13:05:12 2010
New Revision: 105939

URL: http://llvm.org/viewvc/llvm-project?rev=105939&view=rev
Log:
--- Merging r105938 into '.':
U    utils/buildit/build_llvm

Modified:
    llvm/branches/Apple/Troughton/   (props changed)
    llvm/branches/Apple/Troughton/utils/buildit/build_llvm

Propchange: llvm/branches/Apple/Troughton/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 14 13:05:12 2010
@@ -1 +1 @@
-/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105481,105498,105541,105554,105557,105585-105586,105634,105653,105845
+/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105481,105498,105541,105554,105557,105585-105586,105634,105653,105845,105938

Modified: llvm/branches/Apple/Troughton/utils/buildit/build_llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/utils/buildit/build_llvm?rev=105939&r1=105938&r2=105939&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/utils/buildit/build_llvm (original)
+++ llvm/branches/Apple/Troughton/utils/buildit/build_llvm Mon Jun 14 13:05:12 2010
@@ -66,7 +66,6 @@
 DEVELOPER_DIR="${DEVELOPER_DIR-Developer}"
 if [ "$ARM_HOSTED_BUILD" = yes ]; then
     DT_HOME="$DEST_DIR/usr"
-    HOST_SDKROOT=$SDKROOT
 else
     DT_HOME="$DEST_DIR/$DEVELOPER_DIR/usr"
 fi
@@ -195,7 +194,7 @@
 fi
 
 make $JOBS_FLAG $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$HOSTS" \
-    UNIVERSAL_SDK_PATH=$HOST_SDKROOT \
+    UNIVERSAL_SDK_PATH=$SDKROOT \
     NO_RUNTIME_LIBS=1 \
     DISABLE_EDIS=1 \
     LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \