Skip to content

Commit 6ec8e77

Browse files
shr-projectkraj
authored andcommitted
compiler-rt-sanitizers: remove the LLVM_LIBDIR_SUFFIX conditional
As in previous commit for compiler-rt. Since the upgrade to 20 it's installed in nonarch_libdir even when multilib is used and LLVM_LIBDIR_SUFFIX is set to '32'. Fixes: http://errors.yoctoproject.org/Errors/Details/850269/ mv: cannot stat 'TOPDIR/tmp/work/i586-oemllib32-linux/lib32-compiler-rt-sanitizers/20.1.1/image/usr/lib32/linux': No such file or directory Signed-off-by: Martin Jansa <[email protected]>
1 parent 950413c commit 6ec8e77

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

recipes-devtools/clang/compiler-rt-sanitizers_git.bb

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,8 @@ EXTRA_OECMAKE:append:libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON "
8080
EXTRA_OECMAKE:append:powerpc = " -DCOMPILER_RT_DEFAULT_TARGET_ARCH=powerpc "
8181

8282
do_install:append () {
83-
if [ -n "${LLVM_LIBDIR_SUFFIX}" ]; then
84-
mkdir -p ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib
85-
mv ${D}${libdir}/linux ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib
86-
rmdir --ignore-fail-on-non-empty ${D}${libdir}
87-
else
88-
mkdir -p ${D}${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib
89-
mv ${D}${libdir}/linux ${D}${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib
90-
fi
83+
mkdir -p ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib
84+
mv ${D}${nonarch_libdir}/linux ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib
9185
# Already shipped with compile-rt Orc support
9286
rm -rf ${D}${nonarch_libdir}/clang/${MAJOR_VER}/lib/linux/liborc_rt-*.a
9387
rm -rf ${D}${nonarch_libdir}/clang/${MAJOR_VER}/include/orc/

0 commit comments

Comments
 (0)