diff options
Diffstat (limited to 'meta/classes/multilib_header.bbclass')
| -rw-r--r-- | meta/classes/multilib_header.bbclass | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/meta/classes/multilib_header.bbclass b/meta/classes/multilib_header.bbclass index 639ed4ba53..e03f5b13b2 100644 --- a/meta/classes/multilib_header.bbclass +++ b/meta/classes/multilib_header.bbclass @@ -6,13 +6,16 @@ inherit siteinfo # all of the ABI variants for that given architecture. # oe_multilib_header() { - # We use - # For ARM: We don't support multilib builds. + + 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 - arm*) return - ;; mips*) case "${MIPSPKGSFX_ABI}" in "-n32") ident=n32 @@ -24,9 +27,6 @@ oe_multilib_header() { ;; *) ident=${SITEINFO_BITS} esac - if echo ${TARGET_ARCH} | grep -q arm; then - return - fi for each_header in "$@" ; do if [ ! -f "${D}/${includedir}/$each_header" ]; then bberror "oe_multilib_header: Unable to find header $each_header." @@ -39,3 +39,14 @@ oe_multilib_header() { sed -e "s#ENTER_HEADER_FILENAME_HERE#${stem}#g" ${COREBASE}/scripts/multilib_header_wrapper.h > ${D}/${includedir}/$each_header done } + +# Dependencies on arch variables like MIPSPKGSFX_ABI can be problematic. +# We don't need multilib headers for native builds so brute force things. +oe_multilib_header_class-native () { + return +} + +# Nor do we need multilib headers for nativesdk builds. +oe_multilib_header_class-nativesdk () { + return +} |