diff options
author | Tomas Frydrych <tf@openedhand.com> | 2007-01-09 08:19:42 +0000 |
---|---|---|
committer | Tomas Frydrych <tf@openedhand.com> | 2007-01-09 08:19:42 +0000 |
commit | e42e2543f7343a1040ddc28ec6ee4a9c34ee903b (patch) | |
tree | b3e4659c84b591b088cc209069d2e229aa910312 | |
parent | 4737b0ee55f67b80405866fb54cf6af9b8793d31 (diff) | |
download | poky-e42e2543f7343a1040ddc28ec6ee4a9c34ee903b.tar.gz |
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
-rw-r--r-- | meta/packages/gcc/gcc-cross_4.1.1.bb | 2 | ||||
-rw-r--r-- | meta/packages/gcc/gcc3-build-cross.inc | 4 |
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 | |||
5 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" | 5 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" |
6 | # NOTE: split PR. If the main .oe changes something that affects its *build* | 6 | # NOTE: split PR. If the main .oe changes something that affects its *build* |
7 | # remember to increment this one too. | 7 | # remember to increment this one too. |
8 | PR = "r10" | 8 | PR = "r11" |
9 | 9 | ||
10 | DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" | 10 | DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" |
11 | PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" | 11 | 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 () { | |||
46 | done | 46 | done |
47 | 47 | ||
48 | #fix up libsupc++ and libstdc++ la files | 48 | #fix up libsupc++ and libstdc++ la files |
49 | 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 | 49 | 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 |
50 | 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 | 50 | 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 |
51 | } | 51 | } |