meta-environment: Deal with machines which change TARGET_OS

PATCH New Richard Purdie 1 participant 1 message Oct 6, 2014

Share & tools

Richard Purdie

author

2014-10-06 14:08 UTC #0 lore raw

PATCH 1/1 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.

Signed-off-by Richard Purdie <[email protected]>

meta/recipes-core/meta/meta-environment.bb +4 -1

index cf1a83f..9d8bcb7 100644
@@ -6,7 +6,9 @@ PR = "r8"
 
 EXCLUDE_FROM_WORLD = "1"
 
-REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
+ORIGOS := "${TARGET_OS}"
+
+REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${ORIGOS}"
 
 inherit toolchain-scripts
 TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib"

@@ -29,6 +31,7 @@ python do_generate_content() {
 
     # make sure we only use the SDKTARGETSYSROOT value from 'd'
     localdata.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT', True))
+    localdata.setVar('TARGET_OS', d.getVar('ORIGOS', True))
     localdata.setVar('libdir', d.getVar('target_libdir', False))
 
     # Process DEFAULTTUNE