summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2025-07-29 18:14:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-08-04 18:04:04 +0100
commit329d1b4dbe738ff629949f4224dda5cde7855cd3 (patch)
tree38502eddf1ee8d048a709555dec62dbd8c906117
parent455e89f658404ac7b9d1c04dda0f789a03903236 (diff)
downloadpoky-329d1b4dbe738ff629949f4224dda5cde7855cd3.tar.gz
clang: remove ninja-native DEPENDS
The cmake class depends on ninja-native already. (From OE-Core rev: 8ed6ce66de1b54b8129a9895d8cfaf2bb3c3bbb2) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/clang/clang_git.bb2
-rw-r--r--meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb2
-rw-r--r--meta/recipes-devtools/clang/compiler-rt_git.bb2
-rw-r--r--meta/recipes-devtools/clang/libcxx_git.bb1
4 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-devtools/clang/clang_git.bb b/meta/recipes-devtools/clang/clang_git.bb
index dcd2cf145f..7c597eb031 100644
--- a/meta/recipes-devtools/clang/clang_git.bb
+++ b/meta/recipes-devtools/clang/clang_git.bb
@@ -156,7 +156,7 @@ EXTRA_OECMAKE:append:class-target = "\
156 -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \ 156 -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \
157" 157"
158 158
159DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native ninja-native swig-native llvm-tblgen-native" 159DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native swig-native llvm-tblgen-native"
160DEPENDS:append:class-nativesdk = " clang-crosssdk-${SDK_SYS} virtual/nativesdk-cross-binutils" 160DEPENDS:append:class-nativesdk = " clang-crosssdk-${SDK_SYS} virtual/nativesdk-cross-binutils"
161DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} ${@bb.utils.contains('TC_CXX_RUNTIME', 'llvm', 'compiler-rt libcxx', '', d)}" 161DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} ${@bb.utils.contains('TC_CXX_RUNTIME', 'llvm', 'compiler-rt libcxx', '', d)}"
162 162
diff --git a/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb b/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb
index 1724aa9b93..c8bc42c4eb 100644
--- a/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb
+++ b/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb
@@ -39,7 +39,7 @@ CXXFLAGS += "${COMPILER_RT} ${LIBCPLUSPLUS}"
39TOOLCHAIN = "clang" 39TOOLCHAIN = "clang"
40TOOLCHAIN_NATIVE = "clang" 40TOOLCHAIN_NATIVE = "clang"
41 41
42DEPENDS += "ninja-native virtual/crypt compiler-rt" 42DEPENDS += "virtual/crypt compiler-rt"
43DEPENDS:append:class-native = " clang-native libxcrypt-native libcxx-native" 43DEPENDS:append:class-native = " clang-native libxcrypt-native libcxx-native"
44DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-native clang-crosssdk-${SDK_SYS} nativesdk-libxcrypt nativesdk-gcc-runtime" 44DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-native clang-crosssdk-${SDK_SYS} nativesdk-libxcrypt nativesdk-gcc-runtime"
45DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime" 45DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime"
diff --git a/meta/recipes-devtools/clang/compiler-rt_git.bb b/meta/recipes-devtools/clang/compiler-rt_git.bb
index 2e442f4433..0179dc5559 100644
--- a/meta/recipes-devtools/clang/compiler-rt_git.bb
+++ b/meta/recipes-devtools/clang/compiler-rt_git.bb
@@ -25,7 +25,7 @@ TUNE_CCARGS:remove = "-no-integrated-as"
25 25
26INHIBIT_DEFAULT_DEPS = "1" 26INHIBIT_DEFAULT_DEPS = "1"
27 27
28DEPENDS += "ninja-native libgcc" 28DEPENDS += "libgcc"
29DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime" 29DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime"
30DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-native clang-crosssdk-${SDK_SYS} nativesdk-gcc-runtime" 30DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-native clang-crosssdk-${SDK_SYS} nativesdk-gcc-runtime"
31DEPENDS:append:class-native = " clang-native" 31DEPENDS:append:class-native = " clang-native"
diff --git a/meta/recipes-devtools/clang/libcxx_git.bb b/meta/recipes-devtools/clang/libcxx_git.bb
index bd8276e694..6c584decc7 100644
--- a/meta/recipes-devtools/clang/libcxx_git.bb
+++ b/meta/recipes-devtools/clang/libcxx_git.bb
@@ -21,7 +21,6 @@ PACKAGECONFIG[no-atomics] = "-D_LIBCXXABI_HAS_ATOMIC_BUILTINS=OFF -DCMAKE_SHARED
21PACKAGECONFIG[compiler-rt] = "-DLIBCXX_USE_COMPILER_RT=ON -DLIBCXXABI_USE_COMPILER_RT=ON -DLIBUNWIND_USE_COMPILER_RT=ON,,compiler-rt" 21PACKAGECONFIG[compiler-rt] = "-DLIBCXX_USE_COMPILER_RT=ON -DLIBCXXABI_USE_COMPILER_RT=ON -DLIBUNWIND_USE_COMPILER_RT=ON,,compiler-rt"
22PACKAGECONFIG[unwind-shared] = "-DLIBUNWIND_ENABLE_SHARED=ON,-DLIBUNWIND_ENABLE_SHARED=OFF,," 22PACKAGECONFIG[unwind-shared] = "-DLIBUNWIND_ENABLE_SHARED=ON,-DLIBUNWIND_ENABLE_SHARED=OFF,,"
23 23
24DEPENDS += "ninja-native"
25DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${MLPREFIX}compilerlibs" 24DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${MLPREFIX}compilerlibs"
26DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-crosssdk-${SDK_SYS} nativesdk-compiler-rt" 25DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-crosssdk-${SDK_SYS} nativesdk-compiler-rt"
27DEPENDS:append:class-native = " clang-native compiler-rt-native" 26DEPENDS:append:class-native = " clang-native compiler-rt-native"