Since musl ldso can now co-exist in multilib therefore add support to build multilibbed headers and adjust the wrapper header to support musl, it needs __WORDSIZE which is defined in bits/reg.h for musl
[YOCTO #13122] Signed-off-by: Khem Raj <[email protected]> --- meta/classes/multilib_header.bbclass | 7 ------- scripts/multilib_header_wrapper.h | 4 ++++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/meta/classes/multilib_header.bbclass b/meta/classes/multilib_header.bbclass index e03f5b13b2..48f231eed0 100644 --- a/meta/classes/multilib_header.bbclass +++ b/meta/classes/multilib_header.bbclass @@ -6,13 +6,6 @@ inherit siteinfo # all of the ABI variants for that given architecture. # oe_multilib_header() { - - case ${HOST_OS} in - *-musl*) - return - ;; - *) - esac # For MIPS: "n32" is a special case, which needs to be # distinct from both 64-bit and 32-bit. case ${TARGET_ARCH} in diff --git a/scripts/multilib_header_wrapper.h b/scripts/multilib_header_wrapper.h index 88f3193812..a4d6612edb 100644 --- a/scripts/multilib_header_wrapper.h +++ b/scripts/multilib_header_wrapper.h @@ -5,7 +5,11 @@ * */ +#ifdef __GLIBC__ #include <bits/wordsize.h> +#else +#include <bits/reg.h> +#endif #if __WORDSIZE == 32 -- 2.28.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#141685): https://lists.openembedded.org/g/openembedded-core/message/141685 Mute This Topic: https://lists.openembedded.org/mt/76323660/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
