summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-03 16:52:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-06 15:15:51 +0100
commitc8b9996ba8546622d965ffecdcdcbccf677e6c9d (patch)
treefde6e714ea3eae6001f39364d7cc4db6ea5710c2
parent64eca273c6140a261f88943afaccefef3d1aa5e3 (diff)
downloadpoky-c8b9996ba8546622d965ffecdcdcbccf677e6c9d.tar.gz
meta-environment: Deal with machines which change TARGET_OS
Some machines change TARGET_OS, cross-canadian resets this which is not what we want in this specific case. This fixes spe toolchains for example. (From OE-Core rev: 0038634ee6e2b6035c023a2702547f20f67c103a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/meta/meta-environment.bb5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index cf1a83f8f8..9d8bcb71de 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -6,7 +6,9 @@ PR = "r8"
6 6
7EXCLUDE_FROM_WORLD = "1" 7EXCLUDE_FROM_WORLD = "1"
8 8
9REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" 9ORIGOS := "${TARGET_OS}"
10
11REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${ORIGOS}"
10 12
11inherit toolchain-scripts 13inherit toolchain-scripts
12TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib" 14TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib"
@@ -29,6 +31,7 @@ python do_generate_content() {
29 31
30 # make sure we only use the SDKTARGETSYSROOT value from 'd' 32 # make sure we only use the SDKTARGETSYSROOT value from 'd'
31 localdata.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT', True)) 33 localdata.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT', True))
34 localdata.setVar('TARGET_OS', d.getVar('ORIGOS', True))
32 localdata.setVar('libdir', d.getVar('target_libdir', False)) 35 localdata.setVar('libdir', d.getVar('target_libdir', False))
33 36
34 # Process DEFAULTTUNE 37 # Process DEFAULTTUNE