diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-09-30 10:34:07 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-10-01 15:58:36 -0700 |
commit | bfa67c067f749e6cc9c0733a03207fb77d4e175f (patch) | |
tree | b7d0bd732190c9aec774aff9ce237ec4cf5fa621 /classes/clang.bbclass | |
parent | 8f454e7d3fb185f369b6f33ccd7827bb688600c4 (diff) | |
download | meta-clang-bfa67c067f749e6cc9c0733a03207fb77d4e175f.tar.gz |
clang-runtime: Use INHIBIT_DEFAULT_DEPS = "1"
This ensures that clang-runtime elements e.g. llvm-libunwind can be used
with gcc as well
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'classes/clang.bbclass')
-rw-r--r-- | classes/clang.bbclass | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/classes/clang.bbclass b/classes/clang.bbclass index a8f2c90..2e5bab1 100644 --- a/classes/clang.bbclass +++ b/classes/clang.bbclass | |||
@@ -60,7 +60,7 @@ OVERRIDES[vardepsexclude] += "TOOLCHAIN" | |||
60 | #DEPENDS_append_toolchain-clang_class-target = " clang-cross-${TARGET_ARCH} " | 60 | #DEPENDS_append_toolchain-clang_class-target = " clang-cross-${TARGET_ARCH} " |
61 | #DEPENDS_remove_toolchain-clang_allarch = "clang-cross-${TARGET_ARCH}" | 61 | #DEPENDS_remove_toolchain-clang_allarch = "clang-cross-${TARGET_ARCH}" |
62 | 62 | ||
63 | def clang_dep_prepend(d): | 63 | def clang_base_deps(d): |
64 | if not d.getVar('INHIBIT_DEFAULT_DEPS', False): | 64 | if not d.getVar('INHIBIT_DEFAULT_DEPS', False): |
65 | if not oe.utils.inherits(d, 'allarch') : | 65 | if not oe.utils.inherits(d, 'allarch') : |
66 | ret = " clang-cross-${TARGET_ARCH} virtual/libc " | 66 | ret = " clang-cross-${TARGET_ARCH} virtual/libc " |
@@ -79,10 +79,16 @@ def clang_dep_prepend(d): | |||
79 | 79 | ||
80 | def clang_remove_deps(d): | 80 | def clang_remove_deps(d): |
81 | ret = "" | 81 | ret = "" |
82 | if (d.getVar('COMPILER_RT').find('--unwindlib=libunwind') != -1): | 82 | if (d.getVar('UNWINDLIB').find('--unwindlib=libunwind') != -1): |
83 | ret += "libunwind" | 83 | ret += "libunwind" |
84 | return ret | 84 | return ret |
85 | 85 | ||
86 | BASE_DEFAULT_DEPS_toolchain-clang_class-target = "${@clang_dep_prepend(d)}" | 86 | def clang_add_deps(d): |
87 | DEPENDS_remove_toolchain-clang_class-target = "${@clang_remove_deps(d)}" | 87 | ret = "" |
88 | if (d.getVar('UNWINDLIB').find('--unwindlib=libunwind') != -1): | ||
89 | ret += " llvm-libunwind " | ||
90 | return ret | ||
91 | BASE_DEFAULT_DEPS_toolchain-clang_class-target = "${@clang_base_deps(d)}" | ||
92 | DEPENDS_remove_class-target = "${@clang_remove_deps(d)}" | ||
93 | BASE_DEFAULT_DEPS_append_class-target = "${@clang_add_deps(d)}" | ||
88 | 94 | ||