From: Koen Kooi <koen@dominion.thruhere.net>
Date: Mon, 27 Jun 2011 16:56:42 +0000 (+0200)
Subject: gcc-cross-kernel: update to match new toolchain sysroot layout
X-Git-Tag: 2011-1~982
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3f0ee65462acf199b69ed18897ca65755907340e;p=openembedded-core.git

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@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/gcc/gcc-cross-kernel.inc b/meta/recipes-devtools/gcc/gcc-cross-kernel.inc
index 5347762762..be772ba79a 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
 }