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

[Eric Christopher]

Author: echristo
Date: Mon May 10 00:25:36 2010
New Revision: 103392

URL: http://llvm.org/viewvc/llvm-project?rev=103392&view=rev
Log:
Merging 103361 and 103367 from mainline.

Fixes rdar://7756860

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/build_gcc
    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 00:25:36 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
+/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,103367

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=103392&r1=103391&r2=103392&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/build_gcc (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/build_gcc Mon May 10 00:25:36 2010
@@ -561,21 +561,8 @@
 done
 # APPLE LOCAL end native compiler support
 
-if [ $BUILD_CXX -eq 1 ]; then
-for t in $TARGETS ; do
-    if [ "$t" == 'arm' ] ; then
-        cp -p $ARM_SYSROOT/usr/lib/libstdc++.6.dylib \
-            .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/libstdc++.dylib \
-            || exit 1
-    else
-        cp -p /usr/lib/libstdc++.6.dylib \
-            .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/libstdc++.dylib \
-            || exit 1
-    fi
-# LLVM LOCAL
-#  strip -x -c .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/libstdc++.dylib || exit 1
-done
-fi
+# LLVM LOCAL remove libstdc++ copying
+
 
 # include
 HEADERPATH=$DEST_ROOT/include/gcc/darwin/$MAJ_VERS

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=103392&r1=103391&r2=103392&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 00:25:36 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