diff options
author | Esben Haabendal <esben.haabendal@huawei.com> | 2022-01-18 15:57:26 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-02-15 09:59:18 -0800 |
commit | 03648d617e04ec46c227a52e35f5eff766f79814 (patch) | |
tree | fd01d95fddbee8e95c9f6007a56b4afd9c164a69 | |
parent | 72337b33b8a78a87a01dc867a26748035c7bba6d (diff) | |
download | meta-clang-03648d617e04ec46c227a52e35f5eff766f79814.tar.gz |
clang: Remove unintended dependency on gcc-runtime
Commit a494bbb6ec44 ("clang: support android runtime") introduced an
unrelated change causing builds with RUNTIME="llvm" and COMPILER_RT not
set to get a dependency on virtual/${TARGET_PREFIX}compilerlibs.
This is clearly unrelated to addition of support for android runtime,
and causing unwanted depdencies to gcc-runtime for LLVM builds.
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
-rw-r--r-- | classes/clang.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/classes/clang.bbclass b/classes/clang.bbclass index 3db7036..a125d68 100644 --- a/classes/clang.bbclass +++ b/classes/clang.bbclass | |||
@@ -104,7 +104,9 @@ def clang_base_deps(d): | |||
104 | ret += " compiler-rt " | 104 | ret += " compiler-rt " |
105 | else: | 105 | else: |
106 | ret += " libgcc " | 106 | ret += " libgcc " |
107 | if (d.getVar('COMPILER_RT').find('--unwindlib=libunwind') != -1): | 107 | if (d.getVar('RUNTIME').find('llvm') != -1): |
108 | ret += " libcxx" | ||
109 | elif (d.getVar('COMPILER_RT').find('--unwindlib=libunwind') != -1): | ||
108 | ret += " libcxx " | 110 | ret += " libcxx " |
109 | elif (d.getVar('LIBCPLUSPLUS').find('-stdlib=libc++') != -1): | 111 | elif (d.getVar('LIBCPLUSPLUS').find('-stdlib=libc++') != -1): |
110 | ret += " libcxx " | 112 | ret += " libcxx " |