llvm-libunwind: Fix linunwind providers

libunwind can be either nongnu libunwind  ( from OE-Core ) or from llvm
and when using clang and using --unwindlib=libunwind we know we have to
use llvm libunwind implementation, so remove libunwind from DEPENDS and
add llvm-libunwind to depends

Drop providing libunwind from llvm-libunwind since its not needed
anymore

Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 8 insertions, 2 deletions

diff --git a/classes/clang.bbclass b/classes/clang.bbclass
index 6d99b45..a8f2c90 100644
--- a/classes/clang.bbclass
+++ b/classes/clang.bbclass
@@ -77,4 +77,12 @@ def clang_dep_prepend(d):
             return ret
     return ""
 
+def clang_remove_deps(d):
+    ret = ""
+    if (d.getVar('COMPILER_RT').find('--unwindlib=libunwind') != -1):
+        ret += "libunwind"
+    return ret
+
 BASE_DEFAULT_DEPS_toolchain-clang_class-target = "${@clang_dep_prepend(d)}"
+DEPENDS_remove_toolchain-clang_class-target = "${@clang_remove_deps(d)}"
+
diff --git a/recipes-devtools/clang/llvm-libunwind.bb b/recipes-devtools/clang/llvm-libunwind.bb
index 1bcad96..7dbdf4f 100644
--- a/recipes-devtools/clang/llvm-libunwind.bb
+++ b/recipes-devtools/clang/llvm-libunwind.bb
@@ -10,8 +10,6 @@ require common-source.inc
 
 inherit cmake pythonnative
 
-PROVIDES += "libunwind"
-
 DEPENDS += "ninja-native"
 
 LIBCPLUSPLUS = ""