Patch from OE to fix libstc++.la

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1118 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 5 insertions, 1 deletions

diff --git a/meta/packages/gcc/gcc-cross_4.1.1.bb b/meta/packages/gcc/gcc-cross_4.1.1.bb
index 5721dee50b..f69ab5c8b3 100644
--- a/meta/packages/gcc/gcc-cross_4.1.1.bb
+++ b/meta/packages/gcc/gcc-cross_4.1.1.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r9"
+PR = "r10"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/meta/packages/gcc/gcc3-build-cross.inc b/meta/packages/gcc/gcc3-build-cross.inc
index 384886c76e..d0469b7be8 100644
--- a/meta/packages/gcc/gcc3-build-cross.inc
+++ b/meta/packages/gcc/gcc3-build-cross.inc
@@ -44,4 +44,8 @@ do_stage_append () {
         do
                 rm -rf ${CROSS_DIR}/$d
         done
+
+        #fix up libsupc++ and libstdc++ la files
+        sed -i "s|dependency_libs\s*=\s*.*|dependency_libs = '-L${CROSS_DIR}/${TARGET_SYS}/lib -lgcc_s -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libsupc++.la
+        sed -i "s|dependency_libs\s*=\s*.*|dependency_libs = '-L${CROSS_DIR}/${TARGET_SYS}/lib -lgcc_s -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libstdc++.la
 }