[llvm-commits] [llvm] r153972 - /llvm/trunk/utils/buildit/build_llvm

[Bob Wilson]

Author: bwilson
Date: Tue Apr  3 16:50:26 2012
New Revision: 153972

URL: http://llvm.org/viewvc/llvm-project?rev=153972&view=rev
Log:
When building llvmCore, pass the SDKROOT and -arch setting to configure.

So far all of configure tests have been run against the default SDK and
architecture, regardless of what is actually being built.  We've gotten
lucky until now.  <rdar://problem/11112479>

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=153972&r1=153971&r2=153972&view=diff
==============================================================================
--- llvm/trunk/utils/buildit/build_llvm (original)
+++ llvm/trunk/utils/buildit/build_llvm Tue Apr  3 16:50:26 2012
@@ -120,11 +120,21 @@
   configure_opts="--enable-targets=arm,x86"
 fi
 
+if [ "$ARM_HOSTED_BUILD" != yes ]; then
+  if [ $SDKROOT ]; then
+    CPPFLAGS="$CPPFLAGS -isysroot $SDKROOT"
+  fi
+  for host in $HOSTS; do
+    CPPFLAGS="$CPPFLAGS -arch $host"
+  done
+fi
+
 if [ \! -f Makefile.config ]; then
   $SRC_DIR/configure --prefix=$DEST_DIR$DEST_ROOT $configure_opts \
     --enable-assertions=$LLVM_ASSERTIONS \
     --enable-optimized=$LLVM_OPTIMIZED \
     --disable-bindings \
+    CPPFLAGS="$CPPFLAGS" \
     || exit 1
 fi