diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-15 14:40:35 +0100 |
|---|---|---|
| committer |   Robert Yang <liezhi.yang@windriver.com> | 2013-12-10 21:12:17 -0500 |
| commit | 003ddbccb260cdbfc6c1ff9e576a0584b0f25378 (patch) | |
| tree | 67371b2d5b1c309ec8718b0cd027587e7a79a3c0 /meta | |
| parent | 48b4bb2f98a1b7b97688071af4c2d3ee390b6ab3 (diff) | |
| download | openembedded-core-contrib-003ddbccb260cdbfc6c1ff9e576a0584b0f25378.tar.gz | |
cross-canadian: Fix SHLIBSDIR when using multilib
Both nativesdk and multilib use MLPREFIX for their partciular purposes. When
we have both set, cross-canadian can confuse SHLIBSDIR. This forces the
variable to the correct value for cross-canadian, fixing toolchains in
multilib builds.
[YOCTO #5333]
(From OE-Core master rev: 0633b93086a7de7226f4dc6ca403ee116bc58669)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/cross-canadian.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index 4387d05f78..7181c60d5f 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -95,3 +95,8 @@ USE_NLS = "${SDKUSE_NLS}" # We have to us TARGET_ARCH but we care about the absolute value # and not any particular tune that is enabled. TARGET_ARCH[vardepsexclude] = "TUNE_ARCH" + +# If MLPREFIX is set by multilib code, shlibs +# points to the wrong place so force it +SHLIBSDIRS = "${PKGDATA_DIR}/nativesdk-shlibs" +SHLIBSWORKDIR = "${PKGDATA_DIR}/nativesdk-shlibs" |