From 66d7b58f224e55b70b80a01d451270b7de757885 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Fri, 23 Jul 2010 18:04:59 +0100
Subject: bitbake.conf/cross.bbclass: Inject MULTIMACH_TARGET_SYS into the
 toolchain paths to prevent multimachine cross contamination

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/classes/cross.bbclass | 8 ++++++--
 meta/conf/bitbake.conf     | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'meta')

diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index de44e99d7..7c20be0b8 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -43,8 +43,12 @@ target_exec_prefix := "${exec_prefix}"
 prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
 base_prefix = "${STAGING_DIR_NATIVE}"
 exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-base_sbindir = "${base_prefix}/bin"
-sbindir = "${exec_prefix}/bin"
+bindir = "${exec_prefix}/bin/${MULTIMACH_TARGET_SYS}"
+sbindir = "${bindir}"
+base_bindir = "${bindir}"
+base_sbindir = "${bindir}"
+libdir = "${exec_prefix}/lib/${MULTIMACH_TARGET_SYS}"
+libexecdir = "${exec_prefix}/libexec/${MULTIMACH_TARGET_SYS}"
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 819efc3d5..67dd84095 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -259,6 +259,7 @@ STAGING_DIR = "${TMPDIR}/sysroots"
 STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
 STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
 STAGING_BINDIR_CROSS = "${STAGING_BINDIR}/crossscripts"
+STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${BASEPKG_TARGET_SYS}"
 STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
 STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
 STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
@@ -360,7 +361,7 @@ EXTRA_IMAGEDEPENDS = ""
 # Toolchain info.
 ##################################################################
 
-PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
+PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}:${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
 export PATH
 
 ##################################################################
-- 
cgit v1.2.3