diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2014-11-10 20:09:29 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-13 15:42:26 +0000 |
| commit | 26a2f98155a867a71217e52d33f761dcc60800ca (patch) | |
| tree | 37e9e56db48137098189be91ef2bc9c3ad6348c4 /meta/classes/toolchain-scripts.bbclass | |
| parent | 4fc3553cfecb42c124b7cfff8e0d20ade14a3ffc (diff) | |
| download | openembedded-core-26a2f98155a867a71217e52d33f761dcc60800ca.tar.gz openembedded-core-26a2f98155a867a71217e52d33f761dcc60800ca.tar.bz2 openembedded-core-26a2f98155a867a71217e52d33f761dcc60800ca.zip | |
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.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/toolchain-scripts.bbclass')
| -rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 2244cf71c1..96fd93dbc8 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -91,7 +91,7 @@ EOF #we get the cached site config in the runtime TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d, True)}" -TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DATADIR}/${TARGET_SYS}_config_site.d" +TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d" TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TCLIBC} ncurses" #This function create a site config file @@ -131,5 +131,7 @@ python __anonymous () { deps = "" for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split(): deps += " %s:do_populate_sysroot" % dep + for variant in (d.getVar('MULTILIB_VARIANTS', True) or "").split(): + deps += " %s-%s:do_populate_sysroot" % (variant, dep) d.appendVarFlag('do_configure', 'depends', deps) } |