Skip to content

Commit 11b169e

Browse files
lumagkraj
authored andcommitted
layer.conf: disable conflicting LLVM PACKAGECONFIG options
The LLVM package in OE-Core got optional support for building libclc and SPIRV-LLVM-Translator. However this also means that llvm-native also install clang binaries into the sysroot. In order to remove a conflict with the clang recipe from meta-clang forcibly disable PACKAGECONFIG options causing conflict. Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent 8923801 commit 11b169e

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

conf/layer.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ PREFERRED_PROVIDER_libgcc-initial = "libgcc-initial"
3030
PREFERRED_PROVIDER_libunwind = "${@bb.utils.contains_any("TC_CXX_RUNTIME", "llvm android", "libcxx", "libunwind", d)}"
3131
INHERIT += "clang"
3232

33+
# libclc and SPIRV-LLVM-Trasnaltor from OE-Core/llvm conflict with Clang from
34+
# meta-clang
35+
PACKAGECONFIG:remove:pn-llvm = "libclc spirv-llvm-translator"
36+
PACKAGECONFIG:remove:pn-llvm-native = "libclc spirv-llvm-translator"
37+
PACKAGECONFIG:remove:pn-nativesdk-llvm = "libclc spirv-llvm-translator"
38+
3339
# Do not include clang in SDK unless user wants to
3440
CLANGSDK ??= "0"
3541

0 commit comments

Comments
 (0)