[OE-core] [PATCH] staging: fix up multilib destsysroot path

[Dan Dedrick]

The issues here was that WORKDIR changes based on the multilib variant
and the WORKDIR is used in the RECIPE_SYSROOT path. We need to use the
same WORKDIR that everything else is using so reset it before we expand
RECIPE_SYSROOT.

Signed-off-by: Dan Dedrick <ddedrick at lexmark.com>
---
 meta/classes/staging.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index c479bd93ea..bd2ecd4776 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -479,6 +479,7 @@ python extend_recipe_sysroot() {
                 if variant not in multilibs:
                     multilibs[variant] = get_multilib_datastore(variant, d)
                 d2 = multilibs[variant]
+                d2.setVar("WORKDIR", d.getVar("WORKDIR"))
                 destsysroot = d2.getVar("RECIPE_SYSROOT")
 
         native = False
-- 
2.13.6