From 0118f01787eaa91ec2760d0bb8540efadf5c2510 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 3 Jul 2018 23:59:19 +0100 Subject: 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 --- meta/classes/multilib.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/classes') 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 () { 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) -- cgit v1.2.3-54-g00ecf