diff mbox series

[meta-darwin,07/21] cctools-port-crosssdk: fix stale virtual/binutils provider name

Message ID 20261014141209.488034-7-ecordonnier@snap.com
State New
Headers show
Series [meta-darwin,01/21] meta-darwin: bump layer series to wrynose (6.0.3) | expand

Commit Message

Etienne Cordonnier Oct. 14, 2026, 2:10 p.m. UTC 
From: Etienne Cordonnier <ecordonnier@snap.com>

Upstream OE-core commit 4ccc3bc826 ("classes/recipes: Switch
virtual/XXX-gcc to virtual/cross-cc (and c++/binutils)", Jan 2025)
renamed the parameterized virtual/${TARGET_PREFIX}binutils and
virtual/${SDK_PREFIX}binutils to fixed literals virtual/cross-binutils
and virtual/nativesdk-cross-binutils. binutils-crosssdk and
gcc-crosssdk.inc were updated upstream to the new name, but
cctools-port-crosssdk's own PROVIDES and the darwin-common.inc
PREFERRED_PROVIDER override still used the old, now-unmatched name, so
cctools-port-crosssdk silently stopped being selected as the
binutils/as/ld provider for the darwin crosssdk toolchain (gcc, clang,
go). Builds fell back to plain GNU binutils-crosssdk instead, which
has no working Mach-O assembler/linker, causing gcc-crosssdk's
target-libgcc configure to fail with "as: $original is unset".

Confirmed against hawaii/sources/yocto-docs's own migration-5.2.rst,
which documents this exact rename.

AI-Generated: Claude Sonnet 5

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
---
 conf/machine-sdk/darwin-common.inc                            | 2 +-
 recipes-devtools/cctools-port/cctools-port-crosssdk_1010.6.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/conf/machine-sdk/darwin-common.inc b/conf/machine-sdk/darwin-common.inc
index 3dec2b4..632c6b0 100644
--- a/conf/machine-sdk/darwin-common.inc
+++ b/conf/machine-sdk/darwin-common.inc
@@ -5,7 +5,7 @@  SOLIBSDEV:darwin21 = ".dylibbroken"
 
 PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc = "nativesdk-osx-runtime"
 PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial = "nativesdk-osx-runtime"
-PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils = "cctools-port-crosssdk"
+PREFERRED_PROVIDER_virtual/nativesdk-cross-binutils = "cctools-port-crosssdk"
 PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-osx-runtime"
 PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-osx-runtime"
 PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-osx-runtime"
diff --git a/recipes-devtools/cctools-port/cctools-port-crosssdk_1010.6.bb b/recipes-devtools/cctools-port/cctools-port-crosssdk_1010.6.bb
index 0053585..3abeb02 100644
--- a/recipes-devtools/cctools-port/cctools-port-crosssdk_1010.6.bb
+++ b/recipes-devtools/cctools-port/cctools-port-crosssdk_1010.6.bb
@@ -16,7 +16,7 @@  DEPENDS += " \
     libdispatch-native \
 "
 
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
+PROVIDES = "virtual/nativesdk-cross-binutils"
 
 DEPENDS += " \
     clang-native \