[llvm-commits] [llvm-gcc-4.2] r102648 - in /llvm-gcc-4.2/trunk: GNUmakefile build_gcc

[Bob Wilson]

Author: bwilson
Date: Thu Apr 29 13:20:43 2010
New Revision: 102648

URL: http://llvm.org/viewvc/llvm-project?rev=102648&view=rev
Log:
Fix problems installing libLTO.dylib.

Modified:
    llvm-gcc-4.2/trunk/GNUmakefile
    llvm-gcc-4.2/trunk/build_gcc

Modified: llvm-gcc-4.2/trunk/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/GNUmakefile?rev=102648&r1=102647&r2=102648&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/GNUmakefile (original)
+++ llvm-gcc-4.2/trunk/GNUmakefile Thu Apr 29 13:20:43 2010
@@ -88,8 +88,7 @@
 install:
 	$(MAKE) OBJROOT=$(OBJROOT)/obj-llvmCore \
 	        SYMROOT=$(OBJROOT)/sym-llvmCore \
-	        DSTROOT=$(OBJROOT)/dst-llvmCore \
-	        INSTALL_LIBLTO=yes llvmCore
+	        DSTROOT=$(OBJROOT)/dst-llvmCore llvmCore
 	$(MAKE) LLVMCORE_PATH=$(OBJROOT)/dst-llvmCore/Developer/usr/local \
 	        INSTALL_LIBLTO=yes llvmgcc42
 

Modified: llvm-gcc-4.2/trunk/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=102648&r1=102647&r2=102648&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Thu Apr 29 13:20:43 2010
@@ -769,13 +769,14 @@
 
 # Install libLTO.dylib
 if [ "$INSTALL_LIBLTO" == yes ]; then
-  if [ ! -r $LLVMCORE_PATH/Developer/usr/lib/libLTO.dylib ]; then
+  if [ ! -r $LLVMCORE_PATH/lib/libLTO.dylib ]; then
     echo "Error: llvmCore installation is missing libLTO.dylib"
     exit 1
   fi
   mkdir -p $DEST_DIR/Developer/usr/lib
-  cp $LLVMCORE_PATH/Developer/usr/lib/libLTO.dylib \
+  cp $LLVMCORE_PATH/lib/libLTO.dylib \
      $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.
   mkdir -p $DEST_DIR/usr/lib/