Pasthis
Raw |
New paste
Never expires.
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 9f726e4537..306b473374 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -46,8 +46,11 @@ python multilib_virtclass_handler () {
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)
+ overrides = e.data.getVar("OVERRIDES", False)
+ # Remove forcevariable anywhere in OVERRIDES to then make sure it's the last in the list
+ overrides.replace(":forcevariable", "")
+ overrides += ":virtclass-multilib-" + variant + ":forcevariable"
+ e.data.setVar("OVERRIDES", overrides)
return
if bb.data.inherits_class('native', e.data):