summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-07-23 18:04:59 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-23 18:04:59 +0100
commit66d7b58f224e55b70b80a01d451270b7de757885 (patch)
treed59b92cedeb3894561faf499e39baea21b368e40 /meta
parentbf8023237c6fe43781fa4ce0db00f2b08cab7817 (diff)
downloadpoky-66d7b58f224e55b70b80a01d451270b7de757885.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cross.bbclass8
-rw-r--r--meta/conf/bitbake.conf3
2 files changed, 8 insertions, 3 deletions
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index de44e99d70..7c20be0b81 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -43,8 +43,12 @@ target_exec_prefix := "${exec_prefix}"
43prefix = "${STAGING_DIR_NATIVE}${prefix_native}" 43prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
44base_prefix = "${STAGING_DIR_NATIVE}" 44base_prefix = "${STAGING_DIR_NATIVE}"
45exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" 45exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
46base_sbindir = "${base_prefix}/bin" 46bindir = "${exec_prefix}/bin/${MULTIMACH_TARGET_SYS}"
47sbindir = "${exec_prefix}/bin" 47sbindir = "${bindir}"
48base_bindir = "${bindir}"
49base_sbindir = "${bindir}"
50libdir = "${exec_prefix}/lib/${MULTIMACH_TARGET_SYS}"
51libexecdir = "${exec_prefix}/libexec/${MULTIMACH_TARGET_SYS}"
48 52
49do_install () { 53do_install () {
50 oe_runmake 'DESTDIR=${D}' install 54 oe_runmake 'DESTDIR=${D}' install
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 819efc3d58..67dd840959 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -259,6 +259,7 @@ STAGING_DIR = "${TMPDIR}/sysroots"
259STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" 259STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
260STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" 260STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
261STAGING_BINDIR_CROSS = "${STAGING_BINDIR}/crossscripts" 261STAGING_BINDIR_CROSS = "${STAGING_BINDIR}/crossscripts"
262STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${BASEPKG_TARGET_SYS}"
262STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}" 263STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
263STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}" 264STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
264STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}" 265STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
@@ -360,7 +361,7 @@ EXTRA_IMAGEDEPENDS = ""
360# Toolchain info. 361# Toolchain info.
361################################################################## 362##################################################################
362 363
363PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:" 364PATH_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}:"
364export PATH 365export PATH
365 366
366################################################################## 367##################################################################