[oe-commits] Richard Purdie : mulitlib: Ensure SDKTARGETSYSROOT is set correctly

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: a6ade4d24e8153920311db9a9033a7f5c430d1e4
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a6ade4d24e8153920311db9a9033a7f5c430d1e4

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Sat Sep 26 17:44:59 2015 +0100

mulitlib: Ensure SDKTARGETSYSROOT is set correctly

When building something like lib32-core-image-minimal -c populate_sdk, we
expect one sysroot with both multilibs installed. We therefore
need a single SDKTARGETSYSROOT value which doesn't change when multilibs
are enabled.

This makes the image generation code match what the meta-environment
files set the SDK up to use.

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

---

 meta/classes/multilib.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index c0cb6d7..052f911 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -26,6 +26,7 @@ python multilib_virtclass_handler () {
     if bb.data.inherits_class('image', e.data):
         e.data.setVar("MLPREFIX", variant + "-")
         e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
+        e.data.setVar('SDKTARGETSYSROOT', e.data.getVar('SDKTARGETSYSROOT', True))
         target_vendor = e.data.getVar("TARGET_VENDOR_" + "virtclass-multilib-" + variant, False)
         if target_vendor:
             e.data.setVar("TARGET_VENDOR", target_vendor)