diff options
| author |   Jacob Stiffler <j-stiffler@ti.com> | 2016-04-11 17:32:30 -0400 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-21 21:33:19 +0200 |
| commit | d436de861d0ed64ab27e308d0a5223e53dfd6f38 (patch) | |
| tree | 449e1d4c5b785877524633e6bfa52485b5c79508 /meta-oe/recipes-core | |
| parent | 633647253b564176bb6398e9fa528be51625bdac (diff) | |
| download | meta-openembedded-contrib-d436de861d0ed64ab27e308d0a5223e53dfd6f38.tar.gz | |
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>
Diffstat (limited to 'meta-oe/recipes-core')
| -rw-r--r-- | meta-oe/recipes-core/llvm/llvm.inc | 4 |
1 files 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}" \ |