diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-09-12 00:16:40 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2015-09-12 00:16:40 +0000 |
commit | 139aa8280f7558a194b81f8f62be71dbebadab37 (patch) | |
tree | e57ff31b748d6f41e7c977246d0350428b6d65e6 | |
parent | 65217adcff479aca7b4769e8258f7650a8876c7c (diff) | |
download | meta-clang-139aa8280f7558a194b81f8f62be71dbebadab37.tar.gz |
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 <raj.khem@gmail.com>
-rw-r--r-- | conf/layer.conf | 1 | ||||
-rw-r--r-- | recipes-devtools/clang/llvm-libunwind_git.bb | 6 |
2 files changed, 6 insertions, 1 deletions
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" | |||
11 | #PREFERRED_PROVIDER_gcc-cross-initial-${TARGET_ARCH}_forcevariable = "clang-cross" | 11 | #PREFERRED_PROVIDER_gcc-cross-initial-${TARGET_ARCH}_forcevariable = "clang-cross" |
12 | #PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial_forcevariable = "clang-cross" | 12 | #PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial_forcevariable = "clang-cross" |
13 | PREFERRED_PROVIDER_libgcc-initial = "libgcc-initial" | 13 | PREFERRED_PROVIDER_libgcc-initial = "libgcc-initial" |
14 | PREFERRED_PROVIDER_libunwind = "llvm-libunwind" | ||
14 | 15 | ||
15 | BB_DANGLINGAPPENDS_WARNONLY = "1" | 16 | BB_DANGLINGAPPENDS_WARNONLY = "1" |
16 | 17 | ||
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 | |||
14 | inherit cmake | 14 | inherit cmake |
15 | 15 | ||
16 | DEPENDS += "libcxx" | 16 | DEPENDS += "libcxx" |
17 | PROVIDES += "libunwind" | ||
18 | |||
17 | LIC_FILES_CHKSUM = "file://../libcxx/LICENSE.TXT;md5=149d2e8e8d99e3a2d702997b5f919fd9; \ | 19 | LIC_FILES_CHKSUM = "file://../libcxx/LICENSE.TXT;md5=149d2e8e8d99e3a2d702997b5f919fd9; \ |
18 | " | 20 | " |
19 | SRCREV_libunwind = "1d9ef03c3ee017838437e0f3197f2912eebdce5a" | 21 | SRCREV_libunwind = "1d9ef03c3ee017838437e0f3197f2912eebdce5a" |
@@ -39,9 +41,11 @@ EXTRA_OECMAKE += "-DLIBCXXABI_LIBCXX_PATH=${S}/../libcxxabi \ | |||
39 | -DLLVM_BUILD_EXTERNAL_COMPILER_RT=True \ | 41 | -DLLVM_BUILD_EXTERNAL_COMPILER_RT=True \ |
40 | -DLIBCXXABI_ENABLE_SHARED=False \ | 42 | -DLIBCXXABI_ENABLE_SHARED=False \ |
41 | -DUNIX=True \ | 43 | -DUNIX=True \ |
42 | -DLIBUNWIND_ENABLE_SHARED=False \ | ||
43 | " | 44 | " |
44 | do_configure_prepend () { | 45 | do_configure_prepend () { |
45 | (cd ${S}/include && ln -sf ../../libcxxabi/include/__cxxabi_config.h) | 46 | (cd ${S}/include && ln -sf ../../libcxxabi/include/__cxxabi_config.h) |
46 | } | 47 | } |
48 | |||
49 | RPROVIDES_${PN} = "libunwind" | ||
50 | |||
47 | BBCLASSEXTEND = "native nativesdk" | 51 | BBCLASSEXTEND = "native nativesdk" |