diff options
author | Daniel McGregor <daniel.mcgregor@vecima.com> | 2019-02-14 18:42:49 -0600 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-01-20 08:56:16 -0800 |
commit | 269634b393554a5502e47cc0cf9a3f63a5856d45 (patch) | |
tree | aeacca0fcd9352195872459e7b7a5621fd1c0269 /recipes-devtools/clang/libcxx_git.bb | |
parent | cda1376a97b86d6ae5c92fd931f9583430c73885 (diff) | |
download | meta-clang-269634b393554a5502e47cc0cf9a3f63a5856d45.tar.gz |
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>
Diffstat (limited to 'recipes-devtools/clang/libcxx_git.bb')
-rw-r--r-- | recipes-devtools/clang/libcxx_git.bb | 20 |
1 files changed, 3 insertions, 17 deletions
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 | |||
34 | 34 | ||
35 | LLVM_LIBDIR_SUFFIX_powerpc64 = "64" | 35 | LLVM_LIBDIR_SUFFIX_powerpc64 = "64" |
36 | 36 | ||
37 | OECMAKE_TARGET_COMPILE = "cxxabi cxx" | ||
38 | OECMAKE_TARGET_INSTALL = "install-cxx install-cxxabi" | ||
39 | OECMAKE_SOURCEPATH = "${S}/llvm" | ||
37 | EXTRA_OECMAKE += "\ | 40 | EXTRA_OECMAKE += "\ |
38 | -DCMAKE_CROSSCOMPILING=ON \ | 41 | -DCMAKE_CROSSCOMPILING=ON \ |
39 | -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \ | 42 | -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \ |
@@ -54,8 +57,6 @@ EXTRA_OECMAKE += "\ | |||
54 | -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ | 57 | -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ |
55 | -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi;libunwind' \ | 58 | -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi;libunwind' \ |
56 | -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \ | 59 | -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \ |
57 | -G Ninja \ | ||
58 | ${S}/llvm \ | ||
59 | " | 60 | " |
60 | 61 | ||
61 | EXTRA_OECMAKE_append_class-native = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF" | 62 | 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 " | |||
66 | 67 | ||
67 | CXXFLAGS_append_armv5 = " -mfpu=vfp2" | 68 | CXXFLAGS_append_armv5 = " -mfpu=vfp2" |
68 | 69 | ||
69 | do_compile() { | ||
70 | if [ -n "${@bb.utils.filter('PACKAGECONFIG', 'unwind', d)}" ]; then | ||
71 | ninja -v ${PARALLEL_MAKE} unwind | ||
72 | fi | ||
73 | ninja -v ${PARALLEL_MAKE} cxxabi | ||
74 | ninja -v ${PARALLEL_MAKE} cxx | ||
75 | } | ||
76 | |||
77 | do_install() { | ||
78 | #DESTDIR=${D} ninja ${PARALLEL_MAKE} install-unwind | ||
79 | #install -d ${D}${includedir} | ||
80 | #install -m 644 ${S}/libunwind/include/*.h ${D}${includedir} | ||
81 | DESTDIR=${D} ninja ${PARALLEL_MAKE} install-cxx install-cxxabi | ||
82 | } | ||
83 | |||
84 | ALLOW_EMPTY_${PN} = "1" | 70 | ALLOW_EMPTY_${PN} = "1" |
85 | 71 | ||
86 | BBCLASSEXTEND = "native nativesdk" | 72 | BBCLASSEXTEND = "native nativesdk" |