From 1d8389b120231a2a1bfde478ec2910b14a808c7c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 18 Mar 2022 01:47:14 -0700 Subject: 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 --- classes/clang.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/clang.bbclass') 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" def clang_base_deps(d): if not d.getVar('INHIBIT_DEFAULT_DEPS', False): if not oe.utils.inherits(d, 'allarch') : - ret = " clang-cross-${TARGET_ARCH} virtual/libc " + ret = " ${MLPREFIX}clang-cross-${TARGET_ARCH} virtual/libc " if (d.getVar('RUNTIME').find('android') != -1): ret += " libcxx" return ret @@ -126,7 +126,7 @@ BASE_DEFAULT_DEPS:append:class-native:toolchain-clang:runtime-llvm = " libcxx-na BASE_DEFAULT_DEPS:append:class-nativesdk:toolchain-clang:runtime-llvm = " clang-native nativesdk-libcxx nativesdk-compiler-rt" # do_populate_sysroot needs STRIP -POPULATESYSROOTDEPS:toolchain-clang:class-target = "clang-cross-${TARGET_ARCH}:do_populate_sysroot" +POPULATESYSROOTDEPS:toolchain-clang:class-target = "${MLPREFIX}clang-cross-${TARGET_ARCH}:do_populate_sysroot" cmake_do_generate_toolchain_file:append:toolchain-clang () { cat >> ${WORKDIR}/toolchain.cmake <