[oe-commits] Koen Kooi : gcc-cross-kernel: update to match new toolchain sysroot layout

[git version control]

Module: openembedded-core.git
Branch: master
Commit: 3f0ee65462acf199b69ed18897ca65755907340e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3f0ee65462acf199b69ed18897ca65755907340e

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Mon Jun 27 18:56:42 2011 +0200

gcc-cross-kernel: update to match new toolchain sysroot layout

The versioned gcc binary gets installed and the needed binutils symlinks are made.

To make it fully work again the following is needed in kernel recipes/classes:

PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.gcc-cross-kernel:"

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/gcc/gcc-cross-kernel.inc |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-cross-kernel.inc b/meta/recipes-devtools/gcc/gcc-cross-kernel.inc
index 5347762..be772ba 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-kernel.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-kernel.inc
@@ -6,5 +6,14 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
 do_install () {
 	cd gcc
 	oe_runmake 'DESTDIR=${D}' install-common install-headers install-libgcc
-	install -m 0755 xgcc ${D}${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gcc-${PV}
+	install -m 0755 xgcc  ${D}${bindir}/${TARGET_PREFIX}gcc-${PV}
+
+    # 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 cpp; do
+        ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
+        ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t
+    done
 }