$ svn merge -c 79169 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r79169 into '.':
U build_gcc
llvm-svn: 79181
diff --git a/llvm-gcc-4.2/build_gcc b/llvm-gcc-4.2/build_gcc
index 9f56c18..09d4250 100755
--- a/llvm-gcc-4.2/build_gcc
+++ b/llvm-gcc-4.2/build_gcc
@@ -133,6 +133,11 @@
# If the Phone platform is available, use the ARM tools there, else try /
if [ -d $ARM_PLATFORM ]; then
ARM_TOOLROOT=$ARM_PLATFORM/Developer
+ # If it's being built for iPhoneOS, assume the llvmCore bits are under
+ # iPhoneOS platform directory.
+ if [ "x$RC_ProjectName" = "xllvmgcc42_Embedded" ]; then
+ LLVMCORE_PATH="${ARM_PLATFORM}${LLVMCORE_PATH}"
+ fi
else
ARM_TOOLROOT=/
fi
