[llvm-branch-commits] [llvm-gcc-branch] r102649 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ GNUmakefile build_gcc

[Bob Wilson]

Author: bwilson
Date: Thu Apr 29 13:22:55 2010
New Revision: 102649

URL: http://llvm.org/viewvc/llvm-project?rev=102649&view=rev
Log:
--- Merging r102636 into '.':
U    GNUmakefile
--- Merging r102648 into '.':
G    GNUmakefile
U    build_gcc

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile
    llvm-gcc-4.2/branches/Apple/Morbo/build_gcc

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 29 13:22:55 2010
@@ -1,2 +1,2 @@
 /llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102636,102648

Modified: llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile?rev=102649&r1=102648&r2=102649&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile Thu Apr 29 13:22:55 2010
@@ -88,12 +88,11 @@
 install:
 	$(MAKE) OBJROOT=$(OBJROOT)/obj-llvmCore \
 	        SYMROOT=$(OBJROOT)/sym-llvmCore \
-	        DSTROOT=$(OBJROOT)/dst-llvmCore \
-	        INSTALL_LIBLTO=yes install-llvmCore
+	        DSTROOT=$(OBJROOT)/dst-llvmCore llvmCore
 	$(MAKE) LLVMCORE_PATH=$(OBJROOT)/dst-llvmCore/Developer/usr/local \
-	        INSTALL_LIBLTO=yes install-llvmgcc42
+	        INSTALL_LIBLTO=yes llvmgcc42
 
-install-llvmCore: $(OBJROOT) $(SYMROOT) $(DSTROOT)
+llvmCore: $(OBJROOT) $(SYMROOT) $(DSTROOT)
 	if [ ! -d $(SRC)/llvmCore ]; then \
 	  echo "Error: llvmCore source directory is missing"; \
 	  exit 1; \
@@ -105,7 +104,7 @@
 	    $(ENABLE_ASSERTIONS) $(LLVM_OPTIMIZED) $(INSTALL_LIBLTO) \
 	    $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) 
 
-install-llvmgcc42: $(OBJROOT) $(SYMROOT) $(DSTROOT)
+llvmgcc42: $(OBJROOT) $(SYMROOT) $(DSTROOT)
 	cd $(OBJROOT) && \
 	  $(SRC)/build_gcc "$(RC_ARCHS)" "$(TARGETS)" \
 	    $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) $(INSTALL_LIBLTO) \
@@ -164,4 +163,4 @@
 $(OBJROOT) $(SYMROOT) $(DSTROOT):
 	mkdir -p $@
 
-.PHONY: install installsrc clean
+.PHONY: install installsrc clean llvmCore llvmgcc42

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=102649&r1=102648&r2=102649&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/build_gcc (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/build_gcc Thu Apr 29 13:22:55 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/