From 6ec8e778edf8eea06b381b0b30d6ee036f650e7d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 1 Apr 2025 12:29:47 +0200 Subject: 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 --- recipes-devtools/clang/compiler-rt-sanitizers_git.bb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb index e9b6a9e..c892e36 100644 --- a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb +++ b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb @@ -80,14 +80,8 @@ EXTRA_OECMAKE:append:libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON " EXTRA_OECMAKE:append:powerpc = " -DCOMPILER_RT_DEFAULT_TARGET_ARCH=powerpc " do_install:append () { - if [ -n "${LLVM_LIBDIR_SUFFIX}" ]; then - mkdir -p ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib - mv ${D}${libdir}/linux ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib - rmdir --ignore-fail-on-non-empty ${D}${libdir} - else - mkdir -p ${D}${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib - mv ${D}${libdir}/linux ${D}${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib - fi + mkdir -p ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib + mv ${D}${nonarch_libdir}/linux ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib # Already shipped with compile-rt Orc support rm -rf ${D}${nonarch_libdir}/clang/${MAJOR_VER}/lib/linux/liborc_rt-*.a rm -rf ${D}${nonarch_libdir}/clang/${MAJOR_VER}/include/orc/ -- cgit v1.2.3-54-g00ecf