From 5c65e7f345967189ca98f9ed88787d5487c77bb3 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Tue, 28 Jan 2014 19:57:18 +0000 Subject: [PATCH] Use the proper SDK when building iOS sim builds of LLVM and/or Mac OS X builds. llvm-svn: 200335 --- llvm/utils/buildit/build_llvm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/llvm/utils/buildit/build_llvm b/llvm/utils/buildit/build_llvm index 9e9321601cbf..d63d7e88cd23 100755 --- a/llvm/utils/buildit/build_llvm +++ b/llvm/utils/buildit/build_llvm @@ -171,10 +171,10 @@ if [ "$ARM_HOSTED_BUILD" = yes ]; then else # not $ARM_HOSTED_BUILD - export CC=`xcrun -find clang` - export CXX=`xcrun -find clang++` - if [ "$IOS_SIM_BUILD" = yes ]; then + export CC=`xcrun -sdk iphonesimulator -find clang` + export CXX=`xcrun -sdk iphonesimulator -find clang++` + # Use a non-standard "darwin_sim" host triple to trigger a cross-build. configure_opts="--enable-targets=x86 --host=i686-apple-darwin_sim \ --build=i686-apple-darwin10" @@ -183,6 +183,9 @@ else DEPLOYMENT_TARGET=-mios-simulator-version-min=$IPHONEOS_DEPLOYMENT_TARGET" fi else + export CC=`xcrun -sdk macosx -find clang` + export CXX=`xcrun -sdk macosx -find clang++` + configure_opts="--enable-targets=arm,x86" if [ -n "$MACOSX_DEPLOYMENT_TARGET" ]; then COMMON_MAKEFLAGS="$COMMON_MAKEFLAGS \