uclibc: Set MULTILIB_DIR based on baselib

baselib contains the current "lib" value so pass this into
uclibc's configration to allow multilib builds to work correctly.

(From OE-Core rev: 665b03b338d8d710250bd92d6b9a227255f808f8)

(From OE-Core rev: b2fb0f9584f9655321c007f0340e510477176681)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2014-05-06 14:50:24 +01:00
parent b057375f77
commit 3141bc16a5
2 changed files with 2 additions and 0 deletions

View File

@@ -123,6 +123,7 @@ UCLIBC_HAS_GNU_GLOB=y
SHARED_LIB_LOADER_PREFIX="/lib"
RUNTIME_PREFIX="/"
DEVEL_PREFIX="//usr"
MULTILIB_DIR="lib"
#
# Security options

View File

@@ -81,6 +81,7 @@ configmangle = '/^KERNEL_HEADERS/d; \
s,^DOSTRIP.*,# DOSTRIP is not set,g; \
/_[EO]*ABI/d; \
/HAS_FPU/d; \
${@["","s,.*MULTILIB_DIR.*,MULTILIB_DIR=\"${baselib}\",;"][d.getVar("baselib", True) != "lib"]} \
'
OE_FEATURES := "${@features_to_uclibc_conf(d)}"
OE_DEL := "${@features_to_uclibc_del(d)}"