diff options
author | Ross Burton <ross.burton@arm.com> | 2022-02-23 19:23:43 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-09-08 09:08:54 -0700 |
commit | e2c1347b76e338270c822c7273e98f8d487ce3d6 (patch) | |
tree | 9d4b5e216921db2e2a035bfdc4845128ecde65e1 | |
parent | 311b2f040c9fba0b71262a6e88e22fedec117525 (diff) | |
download | meta-clang-e2c1347b76e338270c822c7273e98f8d487ce3d6.tar.gz |
clang: set POPULATESYSROOTDEPS so that strip is present
do_populate_sysroot will execute the cross STRIP as part of the
processing. In non-clang builds this is present via POPULATESYSROOTDEPS
pulling in binutils, but in clang builds STRIP is set to llvm-strip which
obviously isn't part of binutils.
Set POPULATESYSROOTDEPS correctly to ensure that do_populate_sysroot has
the strip binary available.
Signed-off-by: Ross Burton <ross.burton@arm.com>
(cherry picked from commit bf344026d9798d8a9077aa7d52ba29e83cc4dd42)
-rw-r--r-- | classes/clang.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/classes/clang.bbclass b/classes/clang.bbclass index f5a49b7..914c208 100644 --- a/classes/clang.bbclass +++ b/classes/clang.bbclass | |||
@@ -124,6 +124,9 @@ BASE_DEFAULT_DEPS:toolchain-clang:class-target = "${@clang_base_deps(d)}" | |||
124 | BASE_DEFAULT_DEPS:append:class-native:toolchain-clang:runtime-llvm = " libcxx-native compiler-rt-native" | 124 | BASE_DEFAULT_DEPS:append:class-native:toolchain-clang:runtime-llvm = " libcxx-native compiler-rt-native" |
125 | BASE_DEFAULT_DEPS:append:class-nativesdk:toolchain-clang:runtime-llvm = " clang-native nativesdk-libcxx nativesdk-compiler-rt" | 125 | BASE_DEFAULT_DEPS:append:class-nativesdk:toolchain-clang:runtime-llvm = " clang-native nativesdk-libcxx nativesdk-compiler-rt" |
126 | 126 | ||
127 | # do_populate_sysroot needs STRIP | ||
128 | POPULATESYSROOTDEPS:toolchain-clang:class-target = "clang-cross-${TARGET_ARCH}:do_populate_sysroot" | ||
129 | |||
127 | cmake_do_generate_toolchain_file:append:toolchain-clang () { | 130 | cmake_do_generate_toolchain_file:append:toolchain-clang () { |
128 | cat >> ${WORKDIR}/toolchain.cmake <<EOF | 131 | cat >> ${WORKDIR}/toolchain.cmake <<EOF |
129 | set( CMAKE_CLANG_TIDY ${HOST_PREFIX}clang-tidy ) | 132 | set( CMAKE_CLANG_TIDY ${HOST_PREFIX}clang-tidy ) |