From 0633b93086a7de7226f4dc6ca403ee116bc58669 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 15 Oct 2013 14:40:35 +0100 Subject: 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] Signed-off-by: Richard Purdie --- meta/classes/cross-canadian.bbclass | 5 +++++ 1 file changed, 5 insertions(+) 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" -- cgit v1.2.3