From a6ade4d24e8153920311db9a9033a7f5c430d1e4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 26 Sep 2015 17:44:59 +0100 Subject: 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 --- meta/classes/multilib.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'meta') 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) -- cgit 1.2.3-korg