mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 00:32:12 +02:00
clang/meta-ide-support/meta-extsdk-toolchain: Add missing MLPREFIX
'cross' dependencies are hard, the code currently handles adding MLPREFIX in these cases but may not in future depending upon implementation. Add the correct value explictly. (From OE-Core rev: 8393be1792cee0fbe76d75fd20a97dda41134880) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -2,7 +2,7 @@ SUMMARY = "Extensible SDK toolchain meta-recipe"
|
||||
DESCRIPTION = "Meta-recipe for ensuring the build directory contains all appropriate toolchain packages for using an IDE"
|
||||
LICENSE = "MIT"
|
||||
|
||||
DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native"
|
||||
DEPENDS = "virtual/libc ${MLPREFIX}gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native"
|
||||
|
||||
do_populate_sysroot[deptask] = "do_populate_sysroot"
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ DESCRIPTION = "Meta package for ensuring the build directory contains all approp
|
||||
LICENSE = "MIT"
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
||||
DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native cmake-native autoconf-native automake-native meson-native intltool-native pkgconfig-native"
|
||||
DEPENDS = "virtual/libc ${MLPREFIX}gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native cmake-native autoconf-native automake-native meson-native intltool-native pkgconfig-native"
|
||||
RM_WORK_EXCLUDE += "${PN}"
|
||||
|
||||
inherit toolchain-scripts nopackages deploy testsdk
|
||||
|
||||
@@ -139,7 +139,7 @@ EXTRA_OECMAKE:append:class-target = "\
|
||||
|
||||
DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native llvm-tblgen-native"
|
||||
DEPENDS:append:class-nativesdk = " clang-crosssdk-${SDK_SYS} virtual/nativesdk-cross-binutils"
|
||||
DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} ${@bb.utils.contains('TC_CXX_RUNTIME', 'llvm', 'compiler-rt libcxx', '', d)}"
|
||||
DEPENDS:append:class-target = " ${MLPREFIX}clang-cross-${TARGET_ARCH} ${@bb.utils.contains('TC_CXX_RUNTIME', 'llvm', 'compiler-rt libcxx', '', d)}"
|
||||
|
||||
RDEPENDS:${PN}:append:class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' lld', '', d)}"
|
||||
RRECOMMENDS:${PN}:append:class-target = "binutils ${@bb.utils.contains('TC_CXX_RUNTIME', 'llvm', ' libcxx-dev', '', d)}"
|
||||
|
||||
@@ -42,7 +42,7 @@ TOOLCHAIN_NATIVE = "clang"
|
||||
DEPENDS += "virtual/crypt compiler-rt"
|
||||
DEPENDS:append:class-native = " clang-native libxcrypt-native libcxx-native"
|
||||
DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-native clang-crosssdk-${SDK_SYS} nativesdk-libxcrypt nativesdk-gcc-runtime"
|
||||
DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime"
|
||||
DEPENDS:append:class-target = " virtual/cross-c++ ${MLPREFIX}clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime"
|
||||
|
||||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG[crt] = "-DCOMPILER_RT_BUILD_CRT:BOOL=ON,-DCOMPILER_RT_BUILD_CRT:BOOL=OFF"
|
||||
|
||||
@@ -26,7 +26,7 @@ TUNE_CCARGS:remove = "-no-integrated-as"
|
||||
INHIBIT_DEFAULT_DEPS = "1"
|
||||
|
||||
DEPENDS += "libgcc"
|
||||
DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime"
|
||||
DEPENDS:append:class-target = " virtual/cross-c++ ${MLPREFIX}clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime"
|
||||
DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-native clang-crosssdk-${SDK_SYS} nativesdk-gcc-runtime"
|
||||
DEPENDS:append:class-native = " clang-native"
|
||||
DEPENDS:remove:class-native = "libcxx-native compiler-rt-native"
|
||||
|
||||
@@ -21,7 +21,7 @@ PACKAGECONFIG[no-atomics] = "-D_LIBCXXABI_HAS_ATOMIC_BUILTINS=OFF -DCMAKE_SHARED
|
||||
PACKAGECONFIG[compiler-rt] = "-DLIBCXX_USE_COMPILER_RT=ON -DLIBCXXABI_USE_COMPILER_RT=ON -DLIBUNWIND_USE_COMPILER_RT=ON,,compiler-rt"
|
||||
PACKAGECONFIG[unwind-shared] = "-DLIBUNWIND_ENABLE_SHARED=ON,-DLIBUNWIND_ENABLE_SHARED=OFF,,"
|
||||
|
||||
DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${MLPREFIX}compilerlibs"
|
||||
DEPENDS:append:class-target = " virtual/cross-c++ ${MLPREFIX}clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${MLPREFIX}compilerlibs"
|
||||
DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-crosssdk-${SDK_SYS} nativesdk-compiler-rt"
|
||||
DEPENDS:append:class-native = " clang-native compiler-rt-native"
|
||||
DEPENDS:remove:class-native = "libcxx-native"
|
||||
|
||||
Reference in New Issue
Block a user