summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-10-21 14:03:34 -0700
committerKhem Raj <raj.khem@gmail.com>2021-03-08 16:08:38 -0800
commit55098de0c5175d12966ebd530669c3c83315daf4 (patch)
treebb97f15f60bad1d2f15ea90f23a810bcd6b8da08
parent32b64cd3dd096285a54735be91feff3df2634908 (diff)
downloadopenembedded-core-contrib-55098de0c5175d12966ebd530669c3c83315daf4.tar.gz
multilib_header.bbclass: Do not install the stubs for non-multilib case
We mark certain headers which are not usable in multilib case through this function, this however is a unnessary indirection when building distros without multilib feature. Additionally it also addresses a case where we compile baremetal software e.g. bootloaders or BPF binaries e.g. which are a different target effectively but can be built using same toolchain with some flags. This does not work when we always install the stubs since the stubs require a fixed wordsize definition and that may not be true for the BPF cases e.g. it will work fine when multilib is enabled since that would have provided the headers it needed say for 32bit multilib. Currently they go missing for a non-multilib case and we end up with errors like recipe-sysroot/usr/include/bits/long-double.h:23:10: fatal error: 'bits/long-double-32.h' file not found | #include <bits/long-double-32.h> Therefore lets install these stubs only when using multilib in distro Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta/classes/multilib_header.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/multilib_header.bbclass b/meta/classes/multilib_header.bbclass
index e03f5b13b2..9ccdf46be5 100644
--- a/meta/classes/multilib_header.bbclass
+++ b/meta/classes/multilib_header.bbclass
@@ -6,7 +6,9 @@ inherit siteinfo
# all of the ABI variants for that given architecture.
#
oe_multilib_header() {
-
+ if [ -z "${MULTILIB_VARIANTS}" ]; then
+ return
+ fi
case ${HOST_OS} in
*-musl*)
return