From ae695e048867e90fe90ffd93773f73f57db061d1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 9 May 2016 21:46:47 +0000 Subject: compiler-rt: Fix build when blacklist files are installed We build with COMPILER_RT_STANDALONE_BUILD=1 and that makes the install locaiton to be /usr and not something clang verison specific in /usr/lib so we have to manually move the bits to proper location after regular install Signed-off-by: Khem Raj --- recipes-devtools/clang/compiler-rt_git.bb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index 6e13bdd..a9391ed 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb @@ -37,11 +37,15 @@ EXTRA_OECMAKE_append_libc-glibc = " -DCOMPILER_RT_BUILD_SANITIZERS=ON " EXTRA_OECMAKE_append_libc-musl = " -DCOMPILER_RT_BUILD_SANITIZERS=OFF " do_install_append () { - mv -f ${D}${libdir}/linux/* ${D}${libdir} + for f in `find ${D}${libdir}/linux -maxdepth 1 -type f` + do + mv $f ${D}${libdir} + done rmdir ${D}${libdir}/linux - if [ -z `ls -A ${D}${exec_prefix}` ]; then - mv -f ${D}${exec_prefix}/*.txt ${D}${libdir} - fi + for f in `find ${D}${exec_prefix} -maxdepth 1 -name '*.txt' -type f` + do + mv $f ${D}${libdir} + done rm -rf ${D}${libdir}/libclang_rt.asan*.so } -- cgit v1.2.3-54-g00ecf