diff mbox series

[RFC,4/4] multilib_header: wrap musl headers for multilib builds

Message ID 20261029113829.2806167-5-mark.yang@lge.com
State New
Headers show
Series musl multilib: loader path and headers | expand

Commit Message

mark.yang Oct. 29, 2026, 11:38 a.m. UTC 
From: "mark.yang" <mark.yang@lge.com>

Let oe_multilib_header wrap headers on musl when multilib is enabled.
dad1c27463 skipped musl because it was not multilib, and because the
wrapper needed bits/wordsize.h. The wrapper no longer needs it.

Non-multilib musl builds keep their plain headers. Only multilib puts
two variants of a header into one sysroot.

With the musl.inc multilib guard removed, a qemuarm64 + lib32 SDK with
both variants silently replaced 20 asm/*.h headers from
linux-libc-headers and 17 musl bits headers by the lib32 copies. Both
recipes already pass them to oe_multilib_header.

Signed-off-by: mark.yang <mark.yang@lge.com>
---
 meta/classes-recipe/multilib_header.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/multilib_header.bbclass b/meta/classes-recipe/multilib_header.bbclass
index dd65fc02fa..002069f48b 100644
--- a/meta/classes-recipe/multilib_header.bbclass
+++ b/meta/classes-recipe/multilib_header.bbclass
@@ -15,7 +15,7 @@  oe_multilib_header() {
 
 	case ${HOST_OS} in
 	*-musl*)
-		return
+		[ -n "${MULTILIB_VARIANTS}" ] || return 0
 		;;
 	*)
 	esac