[llvm-commits] [llvm-gcc-4.2] r103361 - /llvm-gcc-4.2/trunk/gcc/Makefile.in

[Eric Christopher]

Author: echristo
Date: Sat May  8 18:03:18 2010
New Revision: 103361

URL: http://llvm.org/viewvc/llvm-project?rev=103361&view=rev
Log:
Different partial fix for the libstdc++ problem.  Use a soft link
instead of copying in so that libstdc++ can be updated on the system
without needing to install a new llvm-gcc.

Modified:
    llvm-gcc-4.2/trunk/gcc/Makefile.in

Modified: llvm-gcc-4.2/trunk/gcc/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/Makefile.in?rev=103361&r1=103360&r2=103361&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/Makefile.in (original)
+++ llvm-gcc-4.2/trunk/gcc/Makefile.in Sat May  8 18:03:18 2010
@@ -4102,13 +4102,13 @@
 # $(target_noncanonical)-gcc-$(version)
 # and also as either gcc (if native) or $(gcc_tooldir)/bin/gcc.
 
-# LLVM LOCAL begin copy libstdc++.dylib on Darwin
+# LLVM LOCAL begin soft link libstdc++.dylib on Darwin
 ifneq (,$(findstring darwin,$(target)))
 install-driver: installdirs xgcc$(exeext)
 	-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)
-	-cp -p /usr/lib/libstdc++.6.dylib $(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) )
 	-if [ -f gcc-cross$(exeext) ] ; then \
@@ -4141,7 +4141,7 @@
 	    mv -f $(target_noncanonical)-gcc-tmp$(exeext) $(GCC_TARGET_INSTALL_NAME)$(exeext) ); \
 	fi
 endif
-# LLVM LOCAL end copy libstdc++.dylib on Darwin
+# LLVM LOCAL end soft link libstdc++.dylib on Darwin
 
 # Install the info files.
 # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir