CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

llvm: correct fix for the multilib libdir

Browse Source 
* 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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Jacob Stiffler 2016-04-11 17:32:30 -04:00 committed by Armin Kuster
parent b7cbd4473a
commit 4fe750a964
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-oe/recipes-core/llvm/llvm.inc
View File

@ -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}" \