diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-03-18 01:47:14 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-09-08 09:08:54 -0700 |
commit | e891bee44edd34af155bab55bf32d653ddcb64d3 (patch) | |
tree | d66608cf93b0cd8b9a14bfb4de7c9dbe7a68cd73 | |
parent | 65662ac814dae595fe45f1270d91a6f8fbf167ac (diff) | |
download | meta-clang-e891bee44edd34af155bab55bf32d653ddcb64d3.tar.gz |
clang.bbclass: Be mindful of multilibs when adding tools dependencies
This ensures that multilib prefix is respected in dependencies and can
be handled when distro enables multilib
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 1d8389b120231a2a1bfde478ec2910b14a808c7c)
-rw-r--r-- | classes/clang.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/clang.bbclass b/classes/clang.bbclass index bf8c98d..02dbfe1 100644 --- a/classes/clang.bbclass +++ b/classes/clang.bbclass | |||
@@ -103,7 +103,7 @@ OVERRIDES[vardepsexclude] += "TOOLCHAIN RUNTIME" | |||
103 | def clang_base_deps(d): | 103 | def clang_base_deps(d): |
104 | if not d.getVar('INHIBIT_DEFAULT_DEPS', False): | 104 | if not d.getVar('INHIBIT_DEFAULT_DEPS', False): |
105 | if not oe.utils.inherits(d, 'allarch') : | 105 | if not oe.utils.inherits(d, 'allarch') : |
106 | ret = " clang-cross-${TARGET_ARCH} virtual/libc " | 106 | ret = " ${MLPREFIX}clang-cross-${TARGET_ARCH} virtual/libc " |
107 | if (d.getVar('RUNTIME').find('android') != -1): | 107 | if (d.getVar('RUNTIME').find('android') != -1): |
108 | ret += " libcxx" | 108 | ret += " libcxx" |
109 | return ret | 109 | return ret |
@@ -129,7 +129,7 @@ BASE_DEFAULT_DEPS:append:class-native:toolchain-clang:runtime-llvm = " libcxx-na | |||
129 | BASE_DEFAULT_DEPS:append:class-nativesdk:toolchain-clang:runtime-llvm = " clang-native nativesdk-libcxx nativesdk-compiler-rt" | 129 | BASE_DEFAULT_DEPS:append:class-nativesdk:toolchain-clang:runtime-llvm = " clang-native nativesdk-libcxx nativesdk-compiler-rt" |
130 | 130 | ||
131 | # do_populate_sysroot needs STRIP | 131 | # do_populate_sysroot needs STRIP |
132 | POPULATESYSROOTDEPS:toolchain-clang:class-target = "clang-cross-${TARGET_ARCH}:do_populate_sysroot" | 132 | POPULATESYSROOTDEPS:toolchain-clang:class-target = "${MLPREFIX}clang-cross-${TARGET_ARCH}:do_populate_sysroot" |
133 | 133 | ||
134 | cmake_do_generate_toolchain_file:append:toolchain-clang () { | 134 | cmake_do_generate_toolchain_file:append:toolchain-clang () { |
135 | cat >> ${WORKDIR}/toolchain.cmake <<EOF | 135 | cat >> ${WORKDIR}/toolchain.cmake <<EOF |