[llvm-branch-commits] [llvm-gcc-branch] r102700 - /llvm-gcc-4.2/branches/Apple/Morbo/build_gcc

[Bill Wendling]

Author: void
Date: Fri Apr 30 03:17:35 2010
New Revision: 102700

URL: http://llvm.org/viewvc/llvm-project?rev=102700&view=rev
Log:
Merge r102699.

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

Modified: llvm-gcc-4.2/branches/Apple/Morbo/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/build_gcc?rev=102700&r1=102699&r2=102700&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/build_gcc (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/build_gcc Fri Apr 30 03:17:35 2010
@@ -769,13 +769,16 @@
 
 # Install libLTO.dylib
 if [ "$INSTALL_LIBLTO" == yes ]; then
-  if [ ! -r $LLVMCORE_PATH/lib/libLTO.dylib ]; then
-    echo "Error: llvmCore installation is missing libLTO.dylib"
-    exit 1
+  LTO=$LLVMCORE_PATH/lib/libLTO.dylib
+  if [ ! -r $LTO  ]; then
+    LTO=$LLVMCORE_PATH/../lib/libLTO.dylib
+    if [ ! -r $LTO ]; then
+      echo "Error: llvmCore installation is missing libLTO.dylib"
+      exit 1
+    fi
   fi
   mkdir -p $DEST_DIR/Developer/usr/lib
-  cp $LLVMCORE_PATH/lib/libLTO.dylib \
-     $DEST_DIR/Developer/usr/lib/libLTO.dylib
+  cp $LTO $DEST_DIR/Developer/usr/lib/libLTO.dylib
   strip -S $DEST_DIR/Developer/usr/lib/libLTO.dylib
 
   # Add a symlink in /usr/lib for B&I.