From ae48ee6627e6c1c4f1fcc4ead40edc968e64f7fe Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 2 Jul 2018 17:03:21 +0100 Subject: multilib: Fix issues with some cross-canadian toolchain sysroots MACHINE = "qemumips64" MULTILIBS = "multilib:lib64 multilib:lib32" DEFAULTTUNE = "mips64-n32" DEFAULTTUNE_virtclass-multilib-lib64 = "mips64" DEFAULTTUNE_virtclass-multilib-lib32 = "mips32r2" bitbake core-image-minimal -c populate_sdk Results in gcc-cross-canadian-mips failing to build due to the use of an incorrect sysroot, fix this. All nativesdk pieces should be in the same sysroot (unprefixed). Signed-off-by: Richard Purdie --- meta/classes/multilib.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/classes/multilib.bbclass') diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 1dcd350298..3831d2bab2 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -35,6 +35,8 @@ python multilib_virtclass_handler () { return 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("MLPREFIX", variant + "-") override = ":virtclass-multilib-" + variant e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) -- cgit 1.2.3-korg