[llvm-branch-commits] [llvm-gcc-branch] r103398 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ gcc/Makefile.in

Eric Christopher echristo at apple.com
Mon May 10 01:00:24 PDT 2010


Author: echristo
Date: Mon May 10 03:00:24 2010
New Revision: 103398

URL: http://llvm.org/viewvc/llvm-project?rev=103398&view=rev
Log:
Merge r103394 from mainline.

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/Makefile.in

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 10 03:00:24 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,102561,102636,102648,102745,103361,103366-103367
+/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,102561,102636,102648,102745,103361,103366-103367,103394

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/Makefile.in?rev=103398&r1=103397&r2=103398&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/Makefile.in (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/Makefile.in Mon May 10 03:00:24 2010
@@ -4108,6 +4108,7 @@
 	-rm -f $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
 	-$(INSTALL_PROGRAM) xgcc$(exeext) $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
 	-rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-$(version)$(exeext)
+	-rm -f $(DESTDIR)$(libsubdir)/libstdc++.dylib
 	$(LN_S) /usr/lib/libstdc++.6.dylib $(DESTDIR)$(libsubdir)/libstdc++.dylib
 	-( cd $(DESTDIR)$(bindir) && \
 	   $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version)$(exeext) )





More information about the llvm-branch-commits mailing list