aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-26 17:44:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-26 17:57:44 +0100
commita6ade4d24e8153920311db9a9033a7f5c430d1e4 (patch)
treed905d0e40bae90fe7f65bbbb6bebdd00a4f8bbac
parent87eea290a799be0e852d8b3c357879680abedb77 (diff)
downloadopenembedded-core-contrib-a6ade4d24e8153920311db9a9033a7f5c430d1e4.tar.gz
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@linuxfoundation.org>
-rw-r--r--meta/classes/multilib.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index c0cb6d7294..052f911ac2 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)