diff options
-rw-r--r-- | classes/clang.bbclass | 2 | ||||
-rw-r--r-- | recipes-devtools/clang/compiler-rt_git.bb | 2 | ||||
-rw-r--r-- | recipes-devtools/clang/libcxx_git.bb | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/classes/clang.bbclass b/classes/clang.bbclass index d6a4e9b..93d3581 100644 --- a/classes/clang.bbclass +++ b/classes/clang.bbclass | |||
@@ -8,7 +8,7 @@ RANLIB_toolchain-clang = "${HOST_PREFIX}llvm-ranlib" | |||
8 | AR_toolchain-clang = "${HOST_PREFIX}llvm-ar" | 8 | AR_toolchain-clang = "${HOST_PREFIX}llvm-ar" |
9 | NM_toolchain-clang = "${HOST_PREFIX}llvm-nm" | 9 | NM_toolchain-clang = "${HOST_PREFIX}llvm-nm" |
10 | 10 | ||
11 | COMPILER_RT ??= "--rtlib=compiler-rt" | 11 | COMPILER_RT ??= "--rtlib=compiler-rt --unwindlib=libunwind" |
12 | LIBCPLUSPLUS ??= "--stdlib=libc++" | 12 | LIBCPLUSPLUS ??= "--stdlib=libc++" |
13 | 13 | ||
14 | COMPILER_RT_toolchain-gcc = "" | 14 | COMPILER_RT_toolchain-gcc = "" |
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index ff8d353..172d5cc 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb | |||
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://compiler-rt/LICENSE.TXT;md5=d846d1d65baf322d4c485d6ee | |||
16 | BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt libcxx" | 16 | BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt libcxx" |
17 | DEPENDS_append_toolchain-clang_class-target = " virtual/${TARGET_PREFIX}compilerlibs" | 17 | DEPENDS_append_toolchain-clang_class-target = " virtual/${TARGET_PREFIX}compilerlibs" |
18 | TARGET_CXXFLAGS_remove_toolchain-clang = "--stdlib=libc++" | 18 | TARGET_CXXFLAGS_remove_toolchain-clang = "--stdlib=libc++" |
19 | TUNE_CCARGS_remove_toolchain-clang = "--rtlib=compiler-rt --stdlib=libc++" | 19 | TUNE_CCARGS_remove_toolchain-clang = "--rtlib=compiler-rt --unwindlib=libunwind --stdlib=libc++" |
20 | TUNE_CCARGS_remove = "-no-integrated-as" | 20 | TUNE_CCARGS_remove = "-no-integrated-as" |
21 | DEPENDS += "ninja-native" | 21 | DEPENDS += "ninja-native" |
22 | DEPENDS_append_class-nativesdk = " clang-native" | 22 | DEPENDS_append_class-nativesdk = " clang-native" |
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index c115da0..76b1ea0 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb | |||
@@ -14,12 +14,12 @@ DEPENDS += "ninja-native" | |||
14 | BASEDEPENDS_remove_toolchain-clang = "libcxx" | 14 | BASEDEPENDS_remove_toolchain-clang = "libcxx" |
15 | DEPENDS_append_toolchain-clang = " virtual/${TARGET_PREFIX}compilerlibs" | 15 | DEPENDS_append_toolchain-clang = " virtual/${TARGET_PREFIX}compilerlibs" |
16 | TARGET_CXXFLAGS_remove_toolchain-clang = "--stdlib=libc++" | 16 | TARGET_CXXFLAGS_remove_toolchain-clang = "--stdlib=libc++" |
17 | TUNE_CCARGS_remove_toolchain-clang = "--rtlib=compiler-rt --stdlib=libc++" | 17 | TUNE_CCARGS_remove_toolchain-clang = "--rtlib=compiler-rt --unwindlib=libunwind --stdlib=libc++" |
18 | 18 | ||
19 | PACKAGECONFIG ??= "unwind" | 19 | PACKAGECONFIG ??= "unwind" |
20 | PACKAGECONFIG_powerpc = "" | 20 | PACKAGECONFIG_powerpc = "" |
21 | PACKAGECONFIG_riscv64 = "" | 21 | PACKAGECONFIG_riscv64 = "" |
22 | 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," | 22 | PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBUNWIND_ENABLE_SHARED=ON -DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON -DLIBCXXABI_LIBUNWIND_INCLUDES=${S}/projects/libunwind/include, -DLIBCXXABI_USE_LLVM_UNWINDER=OFF," |
23 | 23 | ||
24 | #PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'libunwind', '', d)}" | 24 | #PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'libunwind', '', d)}" |
25 | LIBUNWIND = "${@bb.utils.contains('PACKAGECONFIG', 'unwind', ';libunwind', '', d)}" | 25 | LIBUNWIND = "${@bb.utils.contains('PACKAGECONFIG', 'unwind', ';libunwind', '', d)}" |
@@ -63,7 +63,6 @@ do_compile() { | |||
63 | do_install() { | 63 | do_install() { |
64 | if ${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'true', 'false', d)}; then | 64 | if ${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'true', 'false', d)}; then |
65 | DESTDIR=${D} ninja ${PARALLEL_MAKE} install-unwind | 65 | DESTDIR=${D} ninja ${PARALLEL_MAKE} install-unwind |
66 | rm -rf ${D}${libdir}/libunwind.so | ||
67 | fi | 66 | fi |
68 | DESTDIR=${D} ninja ${PARALLEL_MAKE} install-cxx install-cxxabi | 67 | DESTDIR=${D} ninja ${PARALLEL_MAKE} install-cxx install-cxxabi |
69 | } | 68 | } |