From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 3 Jul 2018 22:59:19 +0000 (+0100)
Subject: multilib: Tweak previous cross-canadian multilib fix
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~17478
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59a0a05235d80c86251cf45d7142bfc57f2e70d2;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

multilib: Tweak previous cross-canadian multilib fix

As well as setting RECIPE_SYSROOT we also need to set STAGING_DIR_HOST/TARGET.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 3831d2bab29..f2ac8bdfef0 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -37,6 +37,8 @@ python multilib_virtclass_handler () {
     if bb.data.inherits_class('cross-canadian', e.data):
         # Multilib cross-candian should use the same nativesdk sysroot without MLPREFIX
         e.data.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot")
+        e.data.setVar("STAGING_DIR_TARGET", "${WORKDIR}/recipe-sysroot")
+        e.data.setVar("STAGING_DIR_HOST", "${WORKDIR}/recipe-sysroot")
         e.data.setVar("MLPREFIX", variant + "-")
         override = ":virtclass-multilib-" + variant
         e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)