[PATCH 1/2] arm-toolchain/external-arm-toolchain: update for toolchain provider changes
Ross Burton <[email protected]>
| Newsgroups | org.yoctoproject.lists.meta-arm |
|---|---|
| Message-ID | <[email protected]> |
The oe-core commit "classes/recipes: Switch virtual/XXX-gcc to virtual/cross-cc (and c++/binutils)"[1] changes the virtual names that the toolchain components use, so external-arm-toolchain needs updating to use these new names. [1] 4ccc3bc8266c327bcc18c9a3faf7536210dfb9f0 Signed-off-by: Ross Burton <[email protected]> --- .../conf/distro/include/tcmode-external-arm.inc | 16 ++++++++++------ .../external-arm-toolchain.bb | 10 ++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/meta-arm-toolchain/conf/distro/include/tcmode-external-arm.inc b/meta-arm-toolchain/conf/distro/include/tcmode-external-arm.inc index 99fe56b8..0ac71264 100644 --- a/meta-arm-toolchain/conf/distro/include/tcmode-external-arm.inc +++ b/meta-arm-toolchain/conf/distro/include/tcmode-external-arm.inc @@ -37,12 +37,10 @@ SKIP_RECIPE[gcc-sanitizers] = "Using external toolchain" PREFERRED_PROVIDER_linux-libc-headers = "external-arm-toolchain" PREFERRED_PROVIDER_linux-libc-headers-dev = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-arm-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-arm-toolchain" +PREFERRED_PROVIDER_virtual/cross-cc = "external-arm-toolchain" +PREFERRED_PROVIDER_virtual/cross-c++ = "external-arm-toolchain" +PREFERRED_PROVIDER_virtual/cross-binutils = "external-arm-toolchain" +PREFERRED_PROVIDER_virtual/compilerlibs = "external-arm-toolchain" PREFERRED_PROVIDER_glibc = "external-arm-toolchain" PREFERRED_PROVIDER_libgcc = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/libc = "external-arm-toolchain" @@ -55,6 +53,12 @@ PREFERRED_PROVIDER_glibc-mtrace = "external-arm-toolchain" PREFERRED_PROVIDER_libc-mtrace = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-arm-toolchain" +# Keep nativesdk toolchain using GCC +PREFERRED_PROVIDER_virtual/nativesdk-cross-binutils ?= "binutils-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "gcc-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "gcc-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/nativesdk-compilerlibs = "nativesdk-gcc-runtime" + PREFERRED_PROVIDER_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "external-arm-sdk-toolchain-${TRANSLATED_TARGET_ARCH}" PREFERRED_PROVIDER_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "external-arm-sdk-toolchain-${TRANSLATED_TARGET_ARCH}" PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "external-arm-sdk-toolchain-${TRANSLATED_TARGET_ARCH}" diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb index fbb3cbf4..0463b867 100644 --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb @@ -11,12 +11,10 @@ LIC_FILES_CHKSUM = "\ PROVIDES += "\ linux-libc-headers \ - virtual/${TARGET_PREFIX}gcc \ - virtual/${TARGET_PREFIX}g++ \ - virtual/${TARGET_PREFIX}gcc-initial \ - virtual/${TARGET_PREFIX}binutils \ - virtual/${TARGET_PREFIX}libc-for-gcc \ - virtual/${TARGET_PREFIX}compilerlibs \ + virtual/cross-cc \ + virtual/cross-c++ \ + virtual/binutils \ + virtual/compilerlibs \ virtual/libc \ virtual/libintl \ virtual/libiconv \ -- 2.43.0