From 4fe750a9644911f3d282c3f23f122617732c19e4 Mon Sep 17 00:00:00 2001 From: Jacob Stiffler Date: Mon, 11 Apr 2016 17:32:30 -0400 Subject: llvm: correct fix for the multilib libdir * If llvm.inc is used for native and nativesdk class packages, the resulting llvm-config is broken since "${base_libdir}" is prefixed with the full patch to sysroot * Replace "/lib" with "/${baselib}" instead of "${base_libdir}" as "${base_libdir}" is the full path and "${baselib}" is the name of the multilib directory. Signed-off-by: Jacob Stiffler Acked-by: Denys Dmytriyenko Tested-by: Denys Dmytriyenko Signed-off-by: Martin Jansa Signed-off-by: Armin Kuster --- meta-oe/recipes-core/llvm/llvm.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-core/llvm/llvm.inc b/meta-oe/recipes-core/llvm/llvm.inc index 31b2db4e76..02d4617f4e 100644 --- a/meta-oe/recipes-core/llvm/llvm.inc +++ b/meta-oe/recipes-core/llvm/llvm.inc @@ -61,7 +61,7 @@ do_configure_prepend() { sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" ${S}/tools/llvm-config/llvm-config.cpp # Fix the hardcoded libdir in llvm-config - sed -i 's:/lib\>:${base_libdir}:g' ${S}/tools/llvm-config/llvm-config.cpp + sed -i 's:/lib\>:/${baselib}:g' ${S}/tools/llvm-config/llvm-config.cpp # Fails to build unless using separate directory from source mkdir -p ${LLVM_BUILD_DIR} @@ -72,7 +72,7 @@ do_compile() { cd ${LLVM_BUILD_DIR} # Fix libdir for multilib - sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)${base_libdir}:g' Makefile.config + sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)/${baselib}:g' Makefile.config oe_runmake \ AR="${BUILD_AR}" \ -- cgit v1.2.3-54-g00ecf