clang: stay closer to cmake.bbclass

Allow more of the cmake variables coming from the OE environment
through, otherwise the release C flags and CXX flags get reset to
LLVM's default, which greatly extend build times.

Also switch to using cmake.bbclass's do_compile and do_install
commands. There's no need to call ninja directly anymore.

Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>

1 files changed, 37 insertions, 29 deletions

diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index d9d36ad..8983fb9 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -71,9 +71,11 @@ PACKAGECONFIG[rtti] = "-DLLVM_ENABLE_RTTI=ON,-DLLVM_ENABLE_RTTI=OFF,,"
 PACKAGECONFIG[split-dwarf] = "-DLLVM_USE_SPLIT_DWARF=ON,-DLLVM_USE_SPLIT_DWARF=OFF,,"
 PACKAGECONFIG[libedit] = "-DLLVM_ENABLE_LIBEDIT=ON -DLLDB_DISABLE_LIBEDIT=0,-DLLVM_ENABLE_LIBEDIT=OFF -DLLDB_DISABLE_LIBEDIT=1,libedit libedit-native"
 
-BUILDTARGET = "${@bb.utils.contains('PACKAGECONFIG', 'bootstrap', 'stage2', '', d)}"
+OECMAKE_SOURCEPATH = "${S}/llvm"
+
+OECMAKE_TARGET_COMPILE = "${@bb.utils.contains('PACKAGECONFIG', 'bootstrap', 'stage2', 'all', d)}"
+OECMAKE_TARGET_INSTALL = "${@bb.utils.contains('PACKAGECONFIG', 'bootstrap', 'stage2-install', 'install', d)}"
 BINPATHPREFIX = "${@bb.utils.contains('PACKAGECONFIG', 'bootstrap', '/tools/clang/stage2-bins/NATIVE', '', d)}"
-INSTALLTARGET = "${@bb.utils.contains('PACKAGECONFIG', 'bootstrap', 'stage2-install', 'install', d)}"
 
 PASSTHROUGH = "\
 CLANG_DEFAULT_RTLIB;CLANG_DEFAULT_CXX_STDLIB;LLVM_BUILD_LLVM_DYLIB;LLVM_LINK_LLVM_DYLIB;\
@@ -84,6 +86,7 @@ CMAKE_BUILD_TYPE;BUILD_SHARED_LIBS;LLVM_ENABLE_PROJECTS;LLVM_BINUTILS_INCDIR;\
 LLVM_TARGETS_TO_BUILD;LLVM_EXPERIMENTAL_TARGETS_TO_BUILD;PYTHON_EXECUTABLE;\
 PYTHON_LIBRARY;PYTHON_INCLUDE_DIR;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN;LLDB_EDITLINE_USE_WCHAR;\
 LLVM_ENABLE_LIBEDIT;LLDB_DISABLE_LIBEDIT; \
+CMAKE_C_FLAGS_RELEASE;CMAKE_CXX_FLAGS_RELEASE;CMAKE_ASM_FLAGS_RELEASE;\
 "
 #
 # Default to build all OE-Core supported target arches (user overridable).
@@ -114,7 +117,6 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \
                   -DLLVM_ENABLE_PROJECTS='clang;clang-tools-extra;lld;lldb' \
                   -DLLVM_BINUTILS_INCDIR=${STAGING_INCDIR} \
                   -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \
-                  -G Ninja ${S}/llvm \
 "
 
 EXTRA_OECMAKE_append_class-native = "\
@@ -164,13 +166,8 @@ COMPATIBLE_HOST_riscv32 = "null"
 RRECOMMENDS_${PN} = "binutils"
 RRECOMMENDS_${PN}_append_class-target = " libcxx-dev"
 
-do_compile() {
-        ninja ${PARALLEL_MAKE} ${BUILDTARGET}
-}
-
-do_install() {
-        DESTDIR=${D} ninja ${PARALLEL_MAKE} ${INSTALLTARGET}
-        rm -rf ${D}${libdir}/python*/site-packages/six.py
+do_install_append() {
+    rm -rf ${D}${libdir}/python*/site-packages/six.py
 }
 
 do_install_append_class-target () {
@@ -184,31 +181,38 @@ if(DEFINED ENV{YOCTO_ALTERNATE_EXE_PATH})\n\
 else()\n\
   set(_IMPORT_PREFIX_BIN \"\${_IMPORT_PREFIX}/bin\")\n\
 endif()\n" ${D}${libdir}/cmake/llvm/LLVMExports-release.cmake
+
+    if [ -n "${LLVM_LIBDIR_SUFFIX}" ]; then
+        mkdir -p ${D}${nonarch_libdir}
+        mv ${D}${libdir}/clang ${D}${nonarch_libdir}/clang
+        lnr ${D}${nonarch_libdir}/clang ${D}${libdir}/clang
+        rmdir --ignore-fail-on-non-empty ${D}${libdir}
+    fi
 }
 
 do_install_append_class-native () {
-        install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen
-        install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen
-        for f in `find ${D}${bindir} -executable -type f -not -type l`; do
-                test -n "`file $f|grep -i ELF`" && ${STRIP} $f
-                echo "stripped $f"
-        done
-        ln -sf clang-tblgen ${D}${bindir}/clang-tblgen${PV}
-        ln -sf llvm-tblgen ${D}${bindir}/llvm-tblgen${PV}
-        ln -sf llvm-config ${D}${bindir}/llvm-config${PV}
+    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen
+    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen
+    for f in `find ${D}${bindir} -executable -type f -not -type l`; do
+        test -n "`file $f|grep -i ELF`" && ${STRIP} $f
+        echo "stripped $f"
+    done
+    ln -sf clang-tblgen ${D}${bindir}/clang-tblgen${PV}
+    ln -sf llvm-tblgen ${D}${bindir}/llvm-tblgen${PV}
+    ln -sf llvm-config ${D}${bindir}/llvm-config${PV}
 }
 
 do_install_append_class-nativesdk () {
-        install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen
-        install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen
-        for f in `find ${D}${bindir} -executable -type f -not -type l`; do
-                test -n "`file $f|grep -i ELF`" && ${STRIP} $f
-        done
-        ln -sf clang-tblgen ${D}${bindir}/clang-tblgen${PV}
-        ln -sf llvm-tblgen ${D}${bindir}/llvm-tblgen${PV}
-        ln -sf llvm-config ${D}${bindir}/llvm-config${PV}
-        rm -rf ${D}${datadir}/llvm/cmake
-        rm -rf ${D}${datadir}/llvm
+    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen
+    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen
+    for f in `find ${D}${bindir} -executable -type f -not -type l`; do
+        test -n "`file $f|grep -i ELF`" && ${STRIP} $f
+    done
+    ln -sf clang-tblgen ${D}${bindir}/clang-tblgen${PV}
+    ln -sf llvm-tblgen ${D}${bindir}/llvm-tblgen${PV}
+    ln -sf llvm-config ${D}${bindir}/llvm-config${PV}
+    rm -rf ${D}${datadir}/llvm/cmake
+    rm -rf ${D}${datadir}/llvm
 }
 
 PACKAGES =+ "${PN}-libllvm ${PN}-lldb-python libclang"
@@ -225,6 +229,8 @@ FILES_${PN} += "\
   ${libdir}/LLVMHello.so \
   ${libdir}/LLVMgold.so \
   ${libdir}/*Plugin.so \
+  ${libdir}/${BPN} \
+  ${nonarch_libdir}/${BPN}/*/include/ \
   ${datadir}/scan-* \
   ${datadir}/opt-viewer/ \
 "
@@ -255,3 +261,5 @@ SSTATE_SCAN_FILES_remove = "*-config"
 TOOLCHAIN = "clang"
 TOOLCHAIN_class-native = "gcc"
 TOOLCHAIN_class-nativesdk = "clang"
+
+SYSROOT_DIRS_append_class-target = " ${nonarch_libdir}"