qemu.bbclass: Use the correct qemu binary in multilib cases

For example with a lib32 multilib, we need to still use the 64 bit
qemu binary in case we do encounter a 64 bit binary.

(From OE-Core rev: e8ec13a26217bf473504ae4aab22b134dd9dffff)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 3 insertions, 1 deletions

diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 9cefabbf84..cd2e32309d 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -4,7 +4,9 @@
 #
 
 def qemu_target_binary(data):
-    target_arch = data.getVar("TARGET_ARCH", True)
+    target_arch = data.getVar("TARGET_ARCH_MULTILIB_ORIGINAL", True)
+    if not target_arch:
+        target_arch = data.getVar("TARGET_ARCH", True)
     if target_arch in ("i486", "i586", "i686"):
         target_arch = "i386"
     elif target_arch == "powerpc":