mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
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 <j-stiffler@ti.com>
Acked-by: Denys Dmytriyenko <denys@ti.com>
Tested-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
committed by
Martin Jansa
parent
633647253b
commit
d436de861d
@@ -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}" \
|
||||
|
||||
Reference in New Issue
Block a user