[llvm-branch-commits] [llvm-gcc-branch] r106525 - in /llvm-gcc-4.2/branches/Apple/Troughton: ./ gcc/Makefile.in

[Bob Wilson]

Author: bwilson
Date: Mon Jun 21 22:37:15 2010
New Revision: 106525

URL: http://llvm.org/viewvc/llvm-project?rev=106525&view=rev
Log:
--- Merging r106524 into '.':
U    gcc/Makefile.in

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

Propchange: llvm-gcc-4.2/branches/Apple/Troughton/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 22:37:15 2010
@@ -1 +1 @@
-/llvm-gcc-4.2/trunk:105535,106018,106044
+/llvm-gcc-4.2/trunk:105535,106018,106044,106524

Modified: llvm-gcc-4.2/branches/Apple/Troughton/gcc/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Troughton/gcc/Makefile.in?rev=106525&r1=106524&r2=106525&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Troughton/gcc/Makefile.in (original)
+++ llvm-gcc-4.2/branches/Apple/Troughton/gcc/Makefile.in Mon Jun 21 22:37:15 2010
@@ -4108,8 +4108,12 @@
 	-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
+	case $(target) in \
+	  arm*-*-*) ;; \
+	  *) \
+	    rm -f $(DESTDIR)$(libsubdir)/libstdc++.dylib; \
+	    $(LN_S) /usr/lib/libstdc++.6.dylib $(DESTDIR)$(libsubdir)/libstdc++.dylib;; \
+	esac
 	-( cd $(DESTDIR)$(bindir) && \
 	   $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version)$(exeext) )
 	-if [ -f gcc-cross$(exeext) ] ; then \