From 139aa8280f7558a194b81f8f62be71dbebadab37 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 12 Sep 2015 00:16:40 +0000 Subject: llvm-libunwind: Preferred to provide libunwind When using meta-clang use the llvm libunwind instead of HP libubwind which comes from OE-Core Signed-off-by: Khem Raj --- conf/layer.conf | 1 + recipes-devtools/clang/llvm-libunwind_git.bb | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index a378a6e..5ef86e4 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -11,6 +11,7 @@ BBFILE_PRIORITY_clang-layer = "7" #PREFERRED_PROVIDER_gcc-cross-initial-${TARGET_ARCH}_forcevariable = "clang-cross" #PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial_forcevariable = "clang-cross" PREFERRED_PROVIDER_libgcc-initial = "libgcc-initial" +PREFERRED_PROVIDER_libunwind = "llvm-libunwind" BB_DANGLINGAPPENDS_WARNONLY = "1" diff --git a/recipes-devtools/clang/llvm-libunwind_git.bb b/recipes-devtools/clang/llvm-libunwind_git.bb index 4e77dce..32a6ce2 100644 --- a/recipes-devtools/clang/llvm-libunwind_git.bb +++ b/recipes-devtools/clang/llvm-libunwind_git.bb @@ -14,6 +14,8 @@ require clang.inc inherit cmake DEPENDS += "libcxx" +PROVIDES += "libunwind" + LIC_FILES_CHKSUM = "file://../libcxx/LICENSE.TXT;md5=149d2e8e8d99e3a2d702997b5f919fd9; \ " SRCREV_libunwind = "1d9ef03c3ee017838437e0f3197f2912eebdce5a" @@ -39,9 +41,11 @@ EXTRA_OECMAKE += "-DLIBCXXABI_LIBCXX_PATH=${S}/../libcxxabi \ -DLLVM_BUILD_EXTERNAL_COMPILER_RT=True \ -DLIBCXXABI_ENABLE_SHARED=False \ -DUNIX=True \ - -DLIBUNWIND_ENABLE_SHARED=False \ " do_configure_prepend () { (cd ${S}/include && ln -sf ../../libcxxabi/include/__cxxabi_config.h) } + +RPROVIDES_${PN} = "libunwind" + BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf