diff options
-rw-r--r-- | classes/clang.bbclass | 1 | ||||
-rw-r--r-- | recipes-devtools/clang/libcxx_git.bb | 32 |
2 files changed, 14 insertions, 19 deletions
diff --git a/classes/clang.bbclass b/classes/clang.bbclass index a5ca1dd..88dd893 100644 --- a/classes/clang.bbclass +++ b/classes/clang.bbclass | |||
@@ -44,4 +44,3 @@ BASEDEPENDS_append_toolchain-clang_class-target = "${@clang_dep_prepend(d)}" | |||
44 | 44 | ||
45 | PREFERRED_PROVIDER_libunwind = "libunwind" | 45 | PREFERRED_PROVIDER_libunwind = "libunwind" |
46 | PREFERRED_PROVIDER_libunwind_mipsarch = "libunwind" | 46 | PREFERRED_PROVIDER_libunwind_mipsarch = "libunwind" |
47 | PREFERRED_PROVIDER_libunwind_toolchain-clang = "libcxx" | ||
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index b36dede..8168c61 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb | |||
@@ -21,9 +21,10 @@ PACKAGECONFIG ??= "unwind" | |||
21 | PACKAGECONFIG_powerpc = "" | 21 | PACKAGECONFIG_powerpc = "" |
22 | PACKAGECONFIG_mipsarch = "" | 22 | PACKAGECONFIG_mipsarch = "" |
23 | PACKAGECONFIG_riscv64 = "" | 23 | PACKAGECONFIG_riscv64 = "" |
24 | PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXXABI_LIBUNWIND_INCLUDES=${S}/projects/libunwind/include, -DLIBCXXABI_USE_LLVM_UNWINDER=OFF," | 24 | PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBUNWIND_ENABLE_SHARED=OFF -DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON -DLIBCXXABI_LIBUNWIND_INCLUDES=${S}/projects/libunwind/include, -DLIBCXXABI_USE_LLVM_UNWINDER=OFF," |
25 | 25 | ||
26 | PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'libunwind', '', d)}" | 26 | #PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'libunwind', '', d)}" |
27 | LIBUNWIND = "${@bb.utils.contains('PACKAGECONFIG', 'unwind', ';libunwind', '', d)}" | ||
27 | 28 | ||
28 | LIC_FILES_CHKSUM = "file://libcxx/LICENSE.TXT;md5=3de3deb8323d5cf3360104190e804a75 \ | 29 | LIC_FILES_CHKSUM = "file://libcxx/LICENSE.TXT;md5=3de3deb8323d5cf3360104190e804a75 \ |
29 | file://libcxxabi/LICENSE.TXT;md5=9dad5a191d1fc03b31525706040c4ed1 \ | 30 | file://libcxxabi/LICENSE.TXT;md5=9dad5a191d1fc03b31525706040c4ed1 \ |
@@ -40,7 +41,7 @@ EXTRA_OECMAKE += "\ | |||
40 | -DLIBCXXABI_LIBCXX_INCLUDES=${S}/libcxx/include \ | 41 | -DLIBCXXABI_LIBCXX_INCLUDES=${S}/libcxx/include \ |
41 | -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/libcxxabi/include \ | 42 | -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/libcxxabi/include \ |
42 | -DLIBCXX_CXX_ABI_LIBRARY_PATH=${B}/lib \ | 43 | -DLIBCXX_CXX_ABI_LIBRARY_PATH=${B}/lib \ |
43 | -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi;libunwind' \ | 44 | -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi${LIBUNWIND}' \ |
44 | -G Ninja \ | 45 | -G Ninja \ |
45 | ${S}/llvm \ | 46 | ${S}/llvm \ |
46 | " | 47 | " |
@@ -50,26 +51,21 @@ EXTRA_OECMAKE_append_class-nativesdk = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF" | |||
50 | EXTRA_OECMAKE_append_libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON " | 51 | EXTRA_OECMAKE_append_libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON " |
51 | 52 | ||
52 | do_compile() { | 53 | do_compile() { |
53 | 54 | if ${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'true', 'false', d)}; then | |
54 | ninja -v ${PARALLEL_MAKE} cxxabi | 55 | ninja -v ${PARALLEL_MAKE} unwind |
55 | ninja -v ${PARALLEL_MAKE} cxx | 56 | fi |
56 | if ${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'true', 'false', d)}; then | 57 | ninja -v ${PARALLEL_MAKE} cxxabi |
57 | ninja -v ${PARALLEL_MAKE} unwind | 58 | ninja -v ${PARALLEL_MAKE} cxx |
58 | fi | ||
59 | |||
60 | } | 59 | } |
61 | 60 | ||
62 | do_install() { | 61 | do_install() { |
63 | DESTDIR=${D} ninja ${PARALLEL_MAKE} install-cxxabi | 62 | if ${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'true', 'false', d)}; then |
64 | DESTDIR=${D} ninja ${PARALLEL_MAKE} install-cxx | 63 | DESTDIR=${D} ninja ${PARALLEL_MAKE} install-unwind |
65 | if ${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'true', 'false', d)}; then | 64 | rm -rf ${D}${libdir}/libunwind.so |
66 | DESTDIR=${D} ninja ${PARALLEL_MAKE} install-unwind | 65 | fi |
67 | fi | 66 | DESTDIR=${D} ninja ${PARALLEL_MAKE} install-cxx install-cxxabi |
68 | } | 67 | } |
69 | 68 | ||
70 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'libunwind', '', d)}" | ||
71 | FILES_libunwind += "${libdir}/libunwind.so.*" | ||
72 | |||
73 | ALLOW_EMPTY_${PN} = "1" | 69 | ALLOW_EMPTY_${PN} = "1" |
74 | 70 | ||
75 | RDEPENDS_${PN}-dev += "${PN}-staticdev" | 71 | RDEPENDS_${PN}-dev += "${PN}-staticdev" |