Skip to content

Commit

Permalink
recipes: Fix remaining override conversion
Browse files Browse the repository at this point in the history
Signed-off-by: Khem Raj <[email protected]>
  • Loading branch information
kraj committed Aug 3, 2021
1 parent 953591e commit 1fbf558
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion classes/clang.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def clang_base_deps(d):
return ""

BASE_DEFAULT_DEPS:toolchain-clang:class-target = "${@clang_base_deps(d)}"
BASE_DEFAULT_DEPS:append:class-native:toolchain-clang_runtime-llvm = " libcxx-native compiler-rt-native"
BASE_DEFAULT_DEPS:append:class-native:toolchain-clang:runtime-llvm = " libcxx-native compiler-rt-native"

cmake_do_generate_toolchain_file:append:toolchain-clang () {
cat >> ${WORKDIR}/toolchain.cmake <<EOF
Expand Down
6 changes: 3 additions & 3 deletions recipes-devtools/clang/libcxx_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ CXXFLAGS:append:armv5 = " -mfpu=vfp2"

ALLOW_EMPTY:${PN} = "1"

PROVIDES:append_runtime-llvm = " libunwind"
PROVIDES:append:runtime-llvm = " libunwind"

do_install:append() {
if ${@bb.utils.contains("RUNTIME", "llvm", "true", "false", d)}
Expand All @@ -97,8 +97,8 @@ do_install:append() {
fi
}

PACKAGES:append_runtime-llvm = " libunwind"
FILES:libunwind_runtime-llvm = "${libdir}/libunwind.so.*"
PACKAGES:append:runtime-llvm = " libunwind"
FILES:libunwind:runtime-llvm = "${libdir}/libunwind.so.*"

BBCLASSEXTEND = "native nativesdk"
TOOLCHAIN:forcevariable = "clang"
2 changes: 1 addition & 1 deletion recipes-support/libunwind/libunwind_%.bbappend
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

COMPATIBLE_HOST_runtime-llvm = "null"
COMPATIBLE_HOST:runtime-llvm = "null"

0 comments on commit 1fbf558

Please sign in to comment.