aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/staging.bbclass10
1 files changed, 10 insertions, 0 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 1b9e84d97e..412e269bd2 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -480,6 +480,13 @@ python extend_recipe_sysroot() {
multilibs[variant] = get_multilib_datastore(variant, d)
d2 = multilibs[variant]
destsysroot = d2.getVar("RECIPE_SYSROOT")
+ if variant not in fixme:
+ fixme[variant] = []
+ # Clear variant when variant == current_variant since we
+ # don't need handle it as multilib in this case, just handle
+ # it as normal is OK.
+ else:
+ variant = ''
native = False
if c.endswith("-native"):
@@ -508,6 +515,9 @@ python extend_recipe_sysroot() {
if native:
fm = fixme['native']
targetdir = recipesysrootnative
+ elif variant:
+ fm = fixme[variant]
+ targetdir = destsysroot
else:
fm = fixme['']
targetdir = destsysroot