3 files changed, 18 insertions, 9 deletions

diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index 01427b2..736098d 100644
--- a/recipes-devtools/clang/clang.inc
+++ b/recipes-devtools/clang/clang.inc
@@ -7,8 +7,10 @@ LLVM_GIT_PROTOCOL ?= "git"
 #
 # Uncomment below to enable master version of clang/llvm
 #
-BASEPV = "4.0.0"
-PV = "${BASEPV}"
+MAJOR_VER="4"
+MINOR_VER="0"
+PATCH_VER="0"
+PV = "${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}"
 BRANCH = "release_40"
 SRCREV_llvm = "4423e351176a92975739dd4ea43c2ff5877236ae"
 SRCREV_clang = "559aa046fe3260d8640791f2249d7b0d458b5700"
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index 28baa05..656f27a 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -83,7 +83,8 @@ EXTRA_OECMAKE_append_class-nativesdk = "\
 "
 EXTRA_OECMAKE_append_class-target = "\
                -DBUILD_SHARED_LIBS=OFF \
-               -DLLVM_ENABLE_PIC=OFF \
+               -DLLVM_BUILD_LLVM_DYLIB=ON \
+               -DLLVM_ENABLE_PIC=ON \
                -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
                -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
                -DLLVM_TARGETS_TO_BUILD=${@get_clang_target_arch(bb, d)} \
@@ -121,6 +122,8 @@ do_install_append_class-nativesdk () {
 
 PACKAGE_DEBUG_SPLIT_STYLE_class-nativesdk = "debug-without-src"
 
+PACKAGES =+ "${PN}-libllvm"
+
 BBCLASSEXTEND = "native nativesdk"
 
 FILES_${PN} += "\
@@ -129,6 +132,10 @@ FILES_${PN} += "\
   ${datadir}/scan-* \
 "
 
+FILES_${PN}-libllvm += "\
+  ${libdir}/libLLVM-${MAJOR_VER}.${MINOR_VER}.so \
+"
+
 FILES_${PN}-dev += "\
   ${datadir}/llvm/cmake \
   ${libdir}/cmake \
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index 236fadc..4ec440c 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -48,23 +48,23 @@ EXTRA_OECMAKE_append_class-nativesdk = "\
 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
+        install -d ${D}${libdir}/clang/${PV}/lib/linux
         if [ -d ${D}${libdir}/linux ]; then
                 for f in `find ${D}${libdir}/linux -maxdepth 1 -type f`
                 do
-                        mv $f ${D}${libdir}/clang/${BASEPV}/lib/linux
+                        mv $f ${D}${libdir}/clang/${PV}/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}/clang/${BASEPV}
+                mv $f ${D}${libdir}/clang/${PV}
         done
 }
 
 FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/clang/${BASEPV}/lib/linux/lib*${SOLIBSDEV} ${libdir}/clang/${BASEPV}/*.txt"
-FILES_${PN}-staticdev += "${libdir}/clang/${BASEPV}/lib/linux/*.a"
+FILES_${PN} += "${libdir}/clang/${PV}/lib/linux/lib*${SOLIBSDEV} ${libdir}/clang/${PV}/*.txt"
+FILES_${PN}-staticdev += "${libdir}/clang/${PV}/lib/linux/*.a"
 INSANE_SKIP_${PN} = "dev-so"
 
 #PROVIDES_append_class-target = "\
@@ -76,7 +76,7 @@ INSANE_SKIP_${PN} = "dev-so"
 #        "
 #
 
-FILES_${PN}-dev += "${libdir}/clang/${BASEPV}/lib/linux/*.syms"
+FILES_${PN}-dev += "${libdir}/clang/${PV}/lib/linux/*.syms"
 
 BBCLASSEXTEND = "native nativesdk"