diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-15 14:40:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-12 16:59:55 +0000 |
commit | e07b3448708e201bef485b008cefcdcd5dda17dc (patch) | |
tree | 6d8a6672badc3d4e31bc1eeb4fe70d4de431fbe4 /meta | |
parent | 0866fc91def60d5a630af02868bd9c54059dca04 (diff) | |
download | poky-e07b3448708e201bef485b008cefcdcd5dda17dc.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)
(From OE-Core rev: 003ddbccb260cdbfc6c1ff9e576a0584b0f25378)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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}" | |||
95 | # We have to us TARGET_ARCH but we care about the absolute value | 95 | # We have to us TARGET_ARCH but we care about the absolute value |
96 | # and not any particular tune that is enabled. | 96 | # and not any particular tune that is enabled. |
97 | TARGET_ARCH[vardepsexclude] = "TUNE_ARCH" | 97 | TARGET_ARCH[vardepsexclude] = "TUNE_ARCH" |
98 | |||
99 | # If MLPREFIX is set by multilib code, shlibs | ||
100 | # points to the wrong place so force it | ||
101 | SHLIBSDIRS = "${PKGDATA_DIR}/nativesdk-shlibs" | ||
102 | SHLIBSWORKDIR = "${PKGDATA_DIR}/nativesdk-shlibs" | ||