From 6ce232d0769fdaba4a335084c4b4c27bffeda672 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 12 Jan 2023 09:29:45 -0800 Subject: compiler-rt: Do not include tests in build Install uses MAJOR_VERSION only but clang still searches in ${MAJOR_VER}.${MINOR_VER}.${PATCH_VER} for it, so this inconsistency needs to be fixed until them we just move the install from ${MAJOR_VER} -> ${MAJOR_VER}.${MINOR_VER}.${PATCH_VER} Signed-off-by: Khem Raj --- recipes-devtools/clang/compiler-rt_git.bb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'recipes-devtools') diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index 16780e2..1ac10e7 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb @@ -60,6 +60,7 @@ EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \ -DCOMPILER_RT_STANDALONE_BUILD=OFF \ -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \ + -DCOMPILER_RT_INCLUDE_TESTS=OFF \ -DCMAKE_C_COMPILER_TARGET=${HOST_ARCH}${HF}${HOST_VENDOR}-${HOST_OS} \ -DCOMPILER_RT_BUILD_XRAY=OFF \ -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ @@ -86,13 +87,16 @@ EXTRA_OECMAKE:append:powerpc = " -DCOMPILER_RT_DEFAULT_TARGET_ARCH=powerpc " do_install:append () { if [ -n "${LLVM_LIBDIR_SUFFIX}" ]; then - mkdir -p ${D}${nonarch_libdir} - mv ${D}${libdir}/clang ${D}${nonarch_libdir}/clang + mkdir -p ${D}${nonarch_libdir}/clang + mv ${D}${libdir}/clang/${MAJOR_VER} ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER} rmdir --ignore-fail-on-non-empty ${D}${libdir} + else + mv ${D}${libdir}/clang/${MAJOR_VER} ${D}${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER} fi } FILES_SOLIBSDEV = "" + FILES:${PN} += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/lib*${SOLIBSDEV} \ ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/*.txt \ ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/share/*.txt" @@ -100,8 +104,8 @@ FILES:${PN}-staticdev += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PA FILES:${PN}-dev += "${datadir} ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.syms \ ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/include \ ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/clang_rt.crt*.o \ - ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/libclang_rt.asan-preinit*.a \ - " + ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/libclang_rt.asan-preinit*.a" + INSANE_SKIP:${PN} = "dev-so libdir" INSANE_SKIP:${PN}-dbg = "libdir" -- cgit v1.2.3-54-g00ecf