From 269634b393554a5502e47cc0cf9a3f63a5856d45 Mon Sep 17 00:00:00 2001 From: Daniel McGregor Date: Thu, 14 Feb 2019 18:42:49 -0600 Subject: 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 --- recipes-devtools/clang/libcxx_git.bb | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'recipes-devtools/clang/libcxx_git.bb') diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index 7325e4f..518682b 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -34,6 +34,9 @@ LIC_FILES_CHKSUM = "file://libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da39 LLVM_LIBDIR_SUFFIX_powerpc64 = "64" +OECMAKE_TARGET_COMPILE = "cxxabi cxx" +OECMAKE_TARGET_INSTALL = "install-cxx install-cxxabi" +OECMAKE_SOURCEPATH = "${S}/llvm" EXTRA_OECMAKE += "\ -DCMAKE_CROSSCOMPILING=ON \ -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \ @@ -54,8 +57,6 @@ EXTRA_OECMAKE += "\ -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi;libunwind' \ -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \ - -G Ninja \ - ${S}/llvm \ " EXTRA_OECMAKE_append_class-native = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF" @@ -66,21 +67,6 @@ EXTRA_OECMAKE_append_libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON " CXXFLAGS_append_armv5 = " -mfpu=vfp2" -do_compile() { - if [ -n "${@bb.utils.filter('PACKAGECONFIG', 'unwind', d)}" ]; then - ninja -v ${PARALLEL_MAKE} unwind - fi - ninja -v ${PARALLEL_MAKE} cxxabi - ninja -v ${PARALLEL_MAKE} cxx -} - -do_install() { - #DESTDIR=${D} ninja ${PARALLEL_MAKE} install-unwind - #install -d ${D}${includedir} - #install -m 644 ${S}/libunwind/include/*.h ${D}${includedir} - DESTDIR=${D} ninja ${PARALLEL_MAKE} install-cxx install-cxxabi -} - ALLOW_EMPTY_${PN} = "1" BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf