From f26bab34e6c208149fe1ad04521864b663489f4d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 25 Mar 2025 10:31:35 +0100 Subject: compiler-rt: remove the LLVM_LIBDIR_SUFFIX conditional since the upgrade to 20 it's installed in nonarch_libdir even when multilib is used and LLVM_LIBDIR_SUFFIX is set to '32'. I don't know if some people are setting LLVM_LIBDIR_SUFFIX in some more creative way where this won't work, but with the default: LLVM_LIBDIR_SUFFIX="${@d.getVar('baselib').replace('lib', '')}" we don't seem to need this conditional, which actually breaks the build now when the 'else' branch is used. fixes: http://errors.yoctoproject.org/Errors/Details/850268/ mv: cannot stat 'lib32-compiler-rt/20.1.1/image/usr/lib32/linux': No such file or directory No change for build without multilib and compared with 19 most notably include/orc/c_api.h is no longer included in {libdir}/clang/: $ find tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/ tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/ tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/lib tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/lib/clang tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1 tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1/lib tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1/lib/linux tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1/lib/linux/libclang_rt.builtins-x86_64.a tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1/lib/linux/liborc_rt-x86_64.a tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/include tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/include/orc tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/include/orc/c_api.h $ find tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/ tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/ tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7 tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/lib tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/lib/linux tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/lib/linux/libclang_rt.builtins-x86_64.a tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/lib/linux/liborc_rt-x86_64.a tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/include tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/include/orc tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/include/orc/c_api.h for lib32-compiler-rt: $ find tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/ tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/ tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang/19.1.7 tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/lib tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/lib/linux tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/lib/linux/libclang_rt.builtins-i386.a tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/include tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/include/orc tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/include/orc/c_api.h $ find tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/ tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/ tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/lib tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/lib/linux tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/lib/linux/libclang_rt.builtins-i386.a tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/lib/clang tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/lib/clang/20.1.1 tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/lib/clang/20.1.1/lib tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/include tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/include/orc tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/include/orc/c_api.h this is where it failed because there is no /usr/lib32/clang $ find tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/ tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/ tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/lib tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/lib/clang tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1 tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1/lib tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1/lib/linux tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1/lib/linux/libclang_rt.builtins-i386.a tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/include tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/include/orc tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/include/orc/c_api.h Signed-off-by: Martin Jansa Signed-off-by: Denys Dmytriyenko --- recipes-devtools/clang/compiler-rt_git.bb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index 1b65cd3..33049a5 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb @@ -89,14 +89,8 @@ EXTRA_OECMAKE:append:class-nativesdk = "\ 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 } FILES_SOLIBSDEV = "" -- cgit v1.2.3-54-g00ecf