--- Merging r95792 into '.':
U build_gcc
llvm-svn: 95793
diff --git a/llvm-gcc-4.2/build_gcc b/llvm-gcc-4.2/build_gcc
index e4d08e2..86eed38 100755
--- a/llvm-gcc-4.2/build_gcc
+++ b/llvm-gcc-4.2/build_gcc
@@ -142,12 +142,6 @@
ARM_SYSROOT=$ARM_PLATFORM/Developer/SDKs/$ARM_IPHONE_SDK
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}"
- DEST_ROOT="${ARM_PLATFORM}${DEST_ROOT}"
- fi
else
# Use bootstrap SDK if it is available.
@@ -156,11 +150,19 @@
else
ARM_SYSROOT=/
fi
+ ARM_PLATFORM=/
ARM_TOOLROOT=/
fi
ARM_CONFIGFLAGS="$ARM_CONFIGFLAGS --with-build-sysroot=\"$ARM_SYSROOT\""
+# 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}"
+ DEST_ROOT="${ARM_PLATFORM}${DEST_ROOT}"
+fi
+
# If building an ARM target, check that the required directories exist
# and query the libSystem arm slices to determine which multilibs we should
# build.
