summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTomas Frydrych <tf@openedhand.com>2007-01-09 08:19:42 +0000
committerTomas Frydrych <tf@openedhand.com>2007-01-09 08:19:42 +0000
commite42e2543f7343a1040ddc28ec6ee4a9c34ee903b (patch)
treeb3e4659c84b591b088cc209069d2e229aa910312 /meta
parent4737b0ee55f67b80405866fb54cf6af9b8793d31 (diff)
downloadpoky-e42e2543f7343a1040ddc28ec6ee4a9c34ee903b.tar.gz
poky-e42e2543f7343a1040ddc28ec6ee4a9c34ee903b.tar.bz2
poky-e42e2543f7343a1040ddc28ec6ee4a9c34ee903b.zip
follow up fixes from OE for libstdc++.la
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1135 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/gcc/gcc-cross_4.1.1.bb2
-rw-r--r--meta/packages/gcc/gcc3-build-cross.inc4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/packages/gcc/gcc-cross_4.1.1.bb b/meta/packages/gcc/gcc-cross_4.1.1.bb
index f69ab5c8b3..42e9d151b1 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 = "r10"
+PR = "r11"
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 d0469b7be8..94aa1f4e9a 100644
--- a/meta/packages/gcc/gcc3-build-cross.inc
+++ b/meta/packages/gcc/gcc3-build-cross.inc
@@ -46,6 +46,6 @@ do_stage_append () {
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
+ 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 || true
+ 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 || true
}