[oe] [PATCH] bitbake.conf, cross.bbclass: Make multi-machine toolchains to co-exist

[Khem Raj]

From: Tom Rini <tom_rini at mentor.com>

the patch Tom sent has line breaks etc. this is same patch formatted for anybody to test

Signed-off-by: Tom Rini <tom_rini at mentor.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 classes/cross.bbclass |    4 ++--
 conf/bitbake.conf     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index db86192..b3f74a2 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -44,9 +44,9 @@ target_base_libdir := "${base_libdir}"
 target_prefix := "${prefix}"
 
 # Overrides for paths
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefix_native}/${MULTIMACH_TARGET_SYS}"
 base_prefix = "${STAGING_DIR_NATIVE}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}/${MULTIMACH_TARGET_SYS}"
 base_sbindir = "${base_prefix}/bin"
 sbindir = "${exec_prefix}/bin"
 
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index d523519..1b3dd6b 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -299,7 +299,7 @@ STAGING_DIR_JAVA = "${STAGING_DIR}/java"
 STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
 STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
 STAGING_SBINDIR_NATIVE = "${STAGING_DIR_NATIVE}${sbindir_native}"
-STAGING_BINDIR_CROSS  = "${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}"
+STAGING_BINDIR_CROSS  = "${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_TARGET_SYS}${base_bindir_native}"
 STAGING_BINDIR_CROSS_BASEPKG = "${STAGING_DIR_NATIVE}${bindir_native}/${BASEPKG_TARGET_SYS}"
 STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
 STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
-- 
1.7.1