[llvm-branch-commits] [llvm-gcc-branch] r95815 - /llvm-gcc-4.2/branches/Apple/Hermes/build_gcc

[Bob Wilson]

Author: bwilson
Date: Wed Feb 10 15:59:42 2010
New Revision: 95815

URL: http://llvm.org/viewvc/llvm-project?rev=95815&view=rev
Log:
--- Merging r95792 into '.':
U    build_gcc

Modified:
    llvm-gcc-4.2/branches/Apple/Hermes/build_gcc

Modified: llvm-gcc-4.2/branches/Apple/Hermes/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Hermes/build_gcc?rev=95815&r1=95814&r2=95815&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Hermes/build_gcc (original)
+++ llvm-gcc-4.2/branches/Apple/Hermes/build_gcc Wed Feb 10 15:59:42 2010
@@ -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.