diff options
| -rw-r--r-- | meta/recipes-core/uclibc/uclibc-git/uClibc.distro | 1 | ||||
| -rw-r--r-- | meta/recipes-core/uclibc/uclibc.inc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro index c309e6f79a..6575482b34 100644 --- a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro +++ b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro @@ -123,6 +123,7 @@ UCLIBC_HAS_GNU_GLOB=y SHARED_LIB_LOADER_PREFIX="/lib" RUNTIME_PREFIX="/" DEVEL_PREFIX="//usr" +MULTILIB_DIR="lib" # # Security options diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc index e00de62f90..a86ac3ddf7 100644 --- a/meta/recipes-core/uclibc/uclibc.inc +++ b/meta/recipes-core/uclibc/uclibc.inc @@ -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)}" |