summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-03 23:59:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-04 00:02:17 +0100
commit0118f01787eaa91ec2760d0bb8540efadf5c2510 (patch)
treed93362a113655cec383076461b6f82b2ea9977c2 /meta
parentf755066a0001a2d7428c24c67c523b16588dccad (diff)
downloadpoky-0118f01787eaa91ec2760d0bb8540efadf5c2510.tar.gz
multilib: Tweak previous cross-canadian multilib fix
As well as setting RECIPE_SYSROOT we also need to set STAGING_DIR_HOST/TARGET. (From OE-Core rev: 59a0a05235d80c86251cf45d7142bfc57f2e70d2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/multilib.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 3831d2bab2..f2ac8bdfef 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -37,6 +37,8 @@ python multilib_virtclass_handler () {
37 if bb.data.inherits_class('cross-canadian', e.data): 37 if bb.data.inherits_class('cross-canadian', e.data):
38 # Multilib cross-candian should use the same nativesdk sysroot without MLPREFIX 38 # Multilib cross-candian should use the same nativesdk sysroot without MLPREFIX
39 e.data.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot") 39 e.data.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot")
40 e.data.setVar("STAGING_DIR_TARGET", "${WORKDIR}/recipe-sysroot")
41 e.data.setVar("STAGING_DIR_HOST", "${WORKDIR}/recipe-sysroot")
40 e.data.setVar("MLPREFIX", variant + "-") 42 e.data.setVar("MLPREFIX", variant + "-")
41 override = ":virtclass-multilib-" + variant 43 override = ":virtclass-multilib-" + variant
42 e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) 44 e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)