From 2d6f70a7ec88290eab19b23f4d235a190cb0a1e7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 9 Mar 2017 10:21:06 -0800
Subject: compiler-rt: Fix install locations where clang looks for it

This fixes building with clang using compiler-rt on target

clang++ --rtlib compiler-rt --stdlib libc++ -lunwind hello.cpp

would compile and run on target

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes-devtools/clang/clang.inc          |  4 ++--
 recipes-devtools/clang/compiler-rt_git.bb | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index 7887087..5a8895b 100644
--- a/recipes-devtools/clang/clang.inc
+++ b/recipes-devtools/clang/clang.inc
@@ -7,8 +7,8 @@ LLVM_GIT_PROTOCOL ?= "git"
 #
 # Uncomment below to enable master version of clang/llvm
 #
-
-PV = "4.0.0"
+BASEPV = "4.0.0"
+PV = "${BASEPV}"
 BRANCH = "release_40"
 SRCREV_llvm = "4423e351176a92975739dd4ea43c2ff5877236ae"
 SRCREV_clang = "559aa046fe3260d8640791f2249d7b0d458b5700"
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index bd68a5a..9ceaff9 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -41,22 +41,23 @@ EXTRA_OECMAKE += "-DCOMPILER_RT_STANDALONE_BUILD=ON \
 EXTRA_OECMAKE_append_libc-musl = " -DCOMPILER_RT_BUILD_SANITIZERS=OFF -DCOMPILER_RT_BUILD_XRAY=OFF "
 
 do_install_append () {
+	install -d ${D}${libdir}/clang/${BASEPV}/lib/linux
 	if [ -d ${D}${libdir}/linux ]; then
 		for f in `find ${D}${libdir}/linux -maxdepth 1 -type f`
 		do
-			mv $f ${D}${libdir}
+			mv $f ${D}${libdir}/clang/${BASEPV}/lib/linux
 		done
 		rmdir ${D}${libdir}/linux
 	fi
 	for f in `find ${D}${exec_prefix} -maxdepth 1 -name '*.txt' -type f`
 	do
-		mv $f ${D}${libdir}
+		mv $f ${D}${libdir}/clang/${BASEPV}
 	done
-	rm -rf ${D}${libdir}/libclang_rt.asan*.so
 }
 
 FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}"
+FILES_${PN} += "${libdir}/clang/${BASEPV}/lib/linux/lib*${SOLIBSDEV}"
+FILES_${PN}-staticdev += "${libdir}/clang/${BASEPV}/lib/linux/*.a"
 INSANE_SKIP_${PN} = "dev-so"
 
 #PROVIDES_append_class-target = "\
@@ -68,7 +69,7 @@ INSANE_SKIP_${PN} = "dev-so"
 #        "
 #
 
-FILES_${PN}-dev += "${libdir}/*.syms ${libdir}/*.txt"
+FILES_${PN}-dev += "${libdir}/clang/${BASEPV}/lib/linux/*.syms ${libdir}/clang/${BASEPV}/lib/linux/*.txt"
 
 BBCLASSEXTEND = "native nativesdk"
 
-- 
cgit v1.2.3-54-g00ecf