From 72251c8025b6a0db04e18808b68e4cfef1f5ea09 Mon Sep 17 00:00:00 2001 From: Esben Haabendal Date: Tue, 18 Jan 2022 15:57:26 +0100 Subject: 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 (cherry picked from commit 03648d617e04ec46c227a52e35f5eff766f79814) --- classes/clang.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/clang.bbclass b/classes/clang.bbclass index 7ad5ccb..9f1f210 100644 --- a/classes/clang.bbclass +++ b/classes/clang.bbclass @@ -104,7 +104,9 @@ def clang_base_deps(d): ret += " compiler-rt " else: ret += " libgcc " - if (d.getVar('COMPILER_RT').find('--unwindlib=libunwind') != -1): + if (d.getVar('RUNTIME').find('llvm') != -1): + ret += " libcxx" + elif (d.getVar('COMPILER_RT').find('--unwindlib=libunwind') != -1): ret += " libcxx " elif (d.getVar('LIBCPLUSPLUS').find('-stdlib=libc++') != -1): ret += " libcxx " -- cgit v1.2.3-54-g00ecf