diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-03-18 01:47:14 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-03-18 11:05:30 -0700 |
commit | 1d8389b120231a2a1bfde478ec2910b14a808c7c (patch) | |
tree | aa984ecbe795e0ebbcb408b01e39031ce366e3b9 /classes/clang.bbclass | |
parent | 2979956a6925c5a167de451fc804738e96d41637 (diff) | |
download | meta-clang-1d8389b120231a2a1bfde478ec2910b14a808c7c.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>
Diffstat (limited to 'classes/clang.bbclass')
-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 44352aa..89668a0 100644 --- a/classes/clang.bbclass +++ b/classes/clang.bbclass | |||
@@ -100,7 +100,7 @@ OVERRIDES[vardepsexclude] += "TOOLCHAIN RUNTIME" | |||
100 | def clang_base_deps(d): | 100 | def clang_base_deps(d): |
101 | if not d.getVar('INHIBIT_DEFAULT_DEPS', False): | 101 | if not d.getVar('INHIBIT_DEFAULT_DEPS', False): |
102 | if not oe.utils.inherits(d, 'allarch') : | 102 | if not oe.utils.inherits(d, 'allarch') : |
103 | ret = " clang-cross-${TARGET_ARCH} virtual/libc " | 103 | ret = " ${MLPREFIX}clang-cross-${TARGET_ARCH} virtual/libc " |
104 | if (d.getVar('RUNTIME').find('android') != -1): | 104 | if (d.getVar('RUNTIME').find('android') != -1): |
105 | ret += " libcxx" | 105 | ret += " libcxx" |
106 | return ret | 106 | return ret |
@@ -126,7 +126,7 @@ BASE_DEFAULT_DEPS:append:class-native:toolchain-clang:runtime-llvm = " libcxx-na | |||
126 | BASE_DEFAULT_DEPS:append:class-nativesdk:toolchain-clang:runtime-llvm = " clang-native nativesdk-libcxx nativesdk-compiler-rt" | 126 | BASE_DEFAULT_DEPS:append:class-nativesdk:toolchain-clang:runtime-llvm = " clang-native nativesdk-libcxx nativesdk-compiler-rt" |
127 | 127 | ||
128 | # do_populate_sysroot needs STRIP | 128 | # do_populate_sysroot needs STRIP |
129 | POPULATESYSROOTDEPS:toolchain-clang:class-target = "clang-cross-${TARGET_ARCH}:do_populate_sysroot" | 129 | POPULATESYSROOTDEPS:toolchain-clang:class-target = "${MLPREFIX}clang-cross-${TARGET_ARCH}:do_populate_sysroot" |
130 | 130 | ||
131 | cmake_do_generate_toolchain_file:append:toolchain-clang () { | 131 | cmake_do_generate_toolchain_file:append:toolchain-clang () { |
132 | cat >> ${WORKDIR}/toolchain.cmake <<EOF | 132 | cat >> ${WORKDIR}/toolchain.cmake <<EOF |