From bb213d8e60746d61d80505487d5f14a4eb45231b Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 10 Nov 2014 20:09:29 -0600 Subject: meta-environment: Fix config-site with a multilib config [YOCTO #6951] The TOOLCHAIN_CONFIGSITE_SYSROOTCACHE value was defaulting to the nativesdk path and not the associated target path. Set the value in toolchain-scripts to the target path. Be sure to set the MLPREFIX within the meta-environment script as multilibs are processed. Update the config_site file name to use -BPN- not PN. Otherwise the environment processing can't find the correct filename. (From OE-Core rev: 1f05aaa4944ddac6c2b3ba440effdf1eaf732656) Signed-off-by: Mark Hatle Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/meta/meta-environment.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index 9d8bcb71de..bb208a39aa 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb @@ -42,6 +42,7 @@ python do_generate_content() { # Load overrides from 'd' to avoid having to reset the value... overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item localdata.setVar("OVERRIDES", overrides) + localdata.setVar("MLPREFIX", item + "-") bb.data.update_data(localdata) bb.build.exec_func("create_sdk_files", localdata) } -- cgit v1.2.3-54-g00ecf