[gentoo-commits] repo/gentoo:master commit in: eclass/

[Sam James]

commit:     7a1590d2e910c2a6d48aad377c34cf104cc486cb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 10:33:58 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 10:34:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a1590d2

toolchain.eclass: handle ABIs with no multilib flags

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/toolchain.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 90576f2067ea..8df8b506b0b1 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1693,7 +1693,9 @@ gcc_do_make() {
                # XXX: Hack for bug #914881, clean this up when fixed and go 
back
                # to just calling get_abi_LDFLAGS as before.
                local abi_ldflags="$(get_abi_LDFLAGS ${TARGET_DEFAULT_ABI})"
-               printf -v abi_ldflags -- "-Wl,%s " ${abi_ldflags}
+               if [[ -n ${abi_ldflags} ]] ; then
+                       printf -v abi_ldflags -- "-Wl,%s " ${abi_ldflags}
+               fi
 
                # If the host compiler is too old, let's use -O0 per the 
upstream
                # default to be safe (to avoid a bootstrap comparison failure 
later).