diff options
-rw-r--r-- | classes/clang.bbclass | 4 | ||||
-rw-r--r-- | recipes-devtools/clang/compiler-rt_git.bb | 4 | ||||
-rw-r--r-- | recipes-devtools/clang/libcxx_git.bb | 4 | ||||
-rw-r--r-- | recipes-devtools/clang/libcxxabi_git.bb | 2 | ||||
-rw-r--r-- | recipes-devtools/clang/llvm-libunwind_git.bb | 2 |
5 files changed, 14 insertions, 2 deletions
diff --git a/classes/clang.bbclass b/classes/clang.bbclass index f9faff7..f8b05ee 100644 --- a/classes/clang.bbclass +++ b/classes/clang.bbclass | |||
@@ -36,8 +36,8 @@ OVERRIDES[vardepsexclude] += "TOOLCHAIN" | |||
36 | 36 | ||
37 | def clang_dep_prepend(d): | 37 | def clang_dep_prepend(d): |
38 | if not d.getVar('INHIBIT_DEFAULT_DEPS', False): | 38 | if not d.getVar('INHIBIT_DEFAULT_DEPS', False): |
39 | if not oe.utils.inherits(d, 'allarch'): | 39 | if not oe.utils.inherits(d, 'allarch') : |
40 | return " clang-cross-${TARGET_ARCH}" | 40 | return " clang-cross-${TARGET_ARCH} compiler-rt libcxx llvm-libunwind" |
41 | return "" | 41 | return "" |
42 | 42 | ||
43 | BASEDEPENDS_remove_toolchain-clang_class-target = "virtual/${TARGET_PREFIX}gcc" | 43 | BASEDEPENDS_remove_toolchain-clang_class-target = "virtual/${TARGET_PREFIX}gcc" |
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index fa9f0ce..bb68f58 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb | |||
@@ -23,6 +23,10 @@ SRC_URI = "${LLVM_GIT}/compiler-rt.git;protocol=${LLVM_GIT_PROTOCOL};branch=${B | |||
23 | 23 | ||
24 | SRCREV_FORMAT = "compiler-rt" | 24 | SRCREV_FORMAT = "compiler-rt" |
25 | 25 | ||
26 | BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt" | ||
27 | BASEDEPENDS_remove_toolchain-clang_class-target = "libcxx" | ||
28 | BASEDEPENDS_remove_toolchain-clang_class-target = "llvm-libunwind" | ||
29 | |||
26 | S = "${WORKDIR}/git" | 30 | S = "${WORKDIR}/git" |
27 | 31 | ||
28 | inherit cmake pkgconfig pythonnative | 32 | inherit cmake pkgconfig pythonnative |
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index 9167181..c6e2dd5 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb | |||
@@ -12,6 +12,10 @@ inherit cmake pythonnative | |||
12 | PV .= "+git${SRCPV}" | 12 | PV .= "+git${SRCPV}" |
13 | 13 | ||
14 | DEPENDS += "libcxxabi" | 14 | DEPENDS += "libcxxabi" |
15 | BASEDEPENDS_remove_toolchain-clang_class-target = "libcxx" | ||
16 | BASEDEPENDS_remove_toolchain-clang_class-target = "llvm-libunwind" | ||
17 | BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt" | ||
18 | |||
15 | 19 | ||
16 | LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=7b3a0e1b99822669d630011defe9bfd9; \ | 20 | LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=7b3a0e1b99822669d630011defe9bfd9; \ |
17 | " | 21 | " |
diff --git a/recipes-devtools/clang/libcxxabi_git.bb b/recipes-devtools/clang/libcxxabi_git.bb index 86f1464..300e47f 100644 --- a/recipes-devtools/clang/libcxxabi_git.bb +++ b/recipes-devtools/clang/libcxxabi_git.bb | |||
@@ -14,6 +14,8 @@ inherit cmake | |||
14 | PV .= "+git${SRCPV}" | 14 | PV .= "+git${SRCPV}" |
15 | 15 | ||
16 | DEPENDS += "compiler-rt" | 16 | DEPENDS += "compiler-rt" |
17 | BASEDEPENDS_remove_toolchain-clang_class-target = "libcxx" | ||
18 | BASEDEPENDS_remove_toolchain-clang_class-target = "llvm-libunwind" | ||
17 | 19 | ||
18 | LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8ae94dd6195890583eee15a988b6ea79; \ | 20 | LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8ae94dd6195890583eee15a988b6ea79; \ |
19 | " | 21 | " |
diff --git a/recipes-devtools/clang/llvm-libunwind_git.bb b/recipes-devtools/clang/llvm-libunwind_git.bb index c421743..8a9b2c5 100644 --- a/recipes-devtools/clang/llvm-libunwind_git.bb +++ b/recipes-devtools/clang/llvm-libunwind_git.bb | |||
@@ -12,6 +12,8 @@ inherit cmake | |||
12 | PV .= "+git${SRCPV}" | 12 | PV .= "+git${SRCPV}" |
13 | 13 | ||
14 | DEPENDS += "libcxx" | 14 | DEPENDS += "libcxx" |
15 | BASEDEPENDS_remove_toolchain-clang_class-target = "llvm-libunwind" | ||
16 | BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt" | ||
15 | PROVIDES += "libunwind" | 17 | PROVIDES += "libunwind" |
16 | 18 | ||
17 | LIC_FILES_CHKSUM = "file://../libcxx/LICENSE.TXT;md5=7b3a0e1b99822669d630011defe9bfd9; \ | 19 | LIC_FILES_CHKSUM = "file://../libcxx/LICENSE.TXT;md5=7b3a0e1b99822669d630011defe9bfd9; \ |