From: Bob Wilson <bob.wilson@apple.com>
Date: Tue, 3 Apr 2012 21:50:26 +0000 (+0000)
Subject: When building llvmCore, pass the SDKROOT and -arch setting to configure.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=585d580acb252c048692d9a6a3b705d65bf7e5e2;p=oota-llvm.git

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>

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153972 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/buildit/build_llvm b/utils/buildit/build_llvm
index 5c4909c6f34..41ac6678e0a 100755
--- a/utils/buildit/build_llvm
+++ b/utils/buildit/build_llvm
@@ -120,11 +120,21 @@ else
   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