diff options
| author | Dexuan Cui <dexuan.cui@intel.com> | 2011-01-18 12:50:39 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-25 12:25:45 +0000 |
| commit | 23cb814b2761cbe42f1f76e66abb61d8d4584c54 (patch) | |
| tree | 5bd6f5594afd4e0d53ad84547c7c266e810f6d87 | |
| parent | 34729e4f828f2c9efc415838098d4e5dedd456ee (diff) | |
| download | openembedded-core-23cb814b2761cbe42f1f76e66abb61d8d4584c54.tar.gz openembedded-core-23cb814b2761cbe42f1f76e66abb61d8d4584c54.tar.bz2 openembedded-core-23cb814b2761cbe42f1f76e66abb61d8d4584c54.zip | |
gcc-cross-intermediate, gcc-crosssdk-intermediate: change CROSS_TARGET_SYS_DIR and install into new locations
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
3 files changed, 18 insertions, 2 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc index 48c6d9aabe..12fdb70ae8 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc @@ -3,6 +3,8 @@ DEPENDS += "virtual/${TARGET_PREFIX}libc-initial gettext-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate" PACKAGES = "" +CROSS_TARGET_SYS_DIR_append = ".${PN}" + # This is intended to be a -very- basic config # sysroot is needed in case we use libc-initial EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ @@ -28,4 +30,18 @@ do_install () { oe_runmake 'DESTDIR=${D}' install install -d ${D}${target_base_libdir}/ mv ${D}${exec_prefix}/${TARGET_SYS}/lib/* ${D}${target_base_libdir}/ + + # We don't really need this (here shares/ contains man/, info/, locale/). + rm -rf ${D}${datadir}/ + + # We use libiberty from binutils + rm -f ${D}${exec_prefix}/lib/lib/libiberty.a + + # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are + # found. These need to be relative paths so they work in different locations. + dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/ + install -d $dest + for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do + ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t + done } diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.3.3.bb b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.3.3.bb index 9a30cb5119..a8473b0ebe 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.3.3.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.3.3.bb @@ -1,4 +1,4 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc -PR = "r4" +PR = "r5" diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb index 10681dad4b..e65d5df671 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb @@ -1,4 +1,4 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc -PR = "r2" +PR = "r3" |