1 files changed, 3 insertions, 0 deletions

diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 814ac0fd51..f22a6ab596 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -368,6 +368,9 @@ def get_multilib_datastore(variant, d):
         localdata.setVar("OVERRIDES", overrides)
         localdata.setVar("MLPREFIX", variant + "-")
     else:
+        origdefault = localdata.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL")
+        if origdefault:
+            localdata.setVar("DEFAULTTUNE", origdefault)
         overrides = localdata.getVar("OVERRIDES", False).split(":")
         overrides = ":".join([x for x in overrides if not x.startswith("virtclass-multilib-")])
         localdata.setVar("OVERRIDES", overrides)