[llvm-branch-commits] [llvm-gcc-branch] r106720 - in /llvm-gcc-4.2/branches/Apple/Troughton: ./ build_gcc

[Bob Wilson]

Author: bwilson
Date: Wed Jun 23 21:43:03 2010
New Revision: 106720

URL: http://llvm.org/viewvc/llvm-project?rev=106720&view=rev
Log:
--- Merging r106719 into '.':
U    build_gcc

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

Propchange: llvm-gcc-4.2/branches/Apple/Troughton/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 23 21:43:03 2010
@@ -1,2 +1,2 @@
 /llvm/trunk:106564
-/llvm-gcc-4.2/trunk:105535,106018,106044,106524,106564
+/llvm-gcc-4.2/trunk:105535,106018,106044,106524,106564,106719

Modified: llvm-gcc-4.2/branches/Apple/Troughton/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Troughton/build_gcc?rev=106720&r1=106719&r2=106720&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Troughton/build_gcc (original)
+++ llvm-gcc-4.2/branches/Apple/Troughton/build_gcc Wed Jun 23 21:43:03 2010
@@ -552,8 +552,18 @@
 done
 # APPLE LOCAL end native compiler support
 
-# LLVM LOCAL remove libstdc++ copying
-
+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
+        # LLVM LOCAL remove libstdc++ copying for non-ARM targets
+    fi
+# LLVM LOCAL
+#  strip -x -c .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/libstdc++.dylib || exit 1
+done
+fi
 
 # include
 HEADERPATH=$DEST_ROOT/include/gcc/darwin/$MAJ_VERS