From: Hugo Beauzée-Luyssen <[email protected]>

Same issue as the previous libgcc commit: GNU binutils ar cannot
build AIX fat archives, and MULTIDIRS is empty (nothing to repackage)
for a single-arch cross build.

libatomic/ChangeLog:

        * config/t-aix: Skip the 32/64 fat-archive combine and the
        pthread-variant repackage when MULTIDIRS is empty; keep the
        plain local .a wrap unconditional.

Assisted-by: Claude (claude-sonnet-5)
Signed-off-by: Hugo Beauzée-Luyssen <[email protected]>
---
 libatomic/config/t-aix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libatomic/config/t-aix b/libatomic/config/t-aix
index 0e76b9739d7..0c45e278f02 100644
--- a/libatomic/config/t-aix
+++ b/libatomic/config/t-aix
@@ -1,14 +1,18 @@
 ifeq ($(MULTIBUILDTOP),)
-BITS=$(shell if test -z "`$(CC) -x c -E /dev/null -g3 -o - | grep 64BIT`" ; 
then \
-    echo '64'; else echo '32'; fi)
 #MAJOR=$(firstword $(subst :, ,$(libtool_VERSION)))
 MAJOR=1
+ifneq ($(MULTIDIRS),)
+BITS=$(shell if test -z "`$(CC) -x c -E /dev/null -g3 -o - | grep 64BIT`" ; 
then \
+    echo '64'; else echo '32'; fi)
 ARX=$(shell echo $(AR) | sed -e 's/-X[^ ]*//g')
+endif
 all-local:
        -rm -f .libs/$(PACKAGE).a ../pthread/$(PACKAGE)/.libs/$(PACKAGE).a
        $(AR) rc .libs/$(PACKAGE).a .libs/$(PACKAGE).so.$(MAJOR)
+ifneq ($(MULTIDIRS),)
        $(AR) rc ../pthread/$(PACKAGE)/.libs/$(PACKAGE).a 
../pthread/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR)
        $(ARX) -X$(BITS) rc .libs/$(PACKAGE).a 
../ppc$(BITS)/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR)
        $(ARX) -X$(BITS) rc ../pthread/$(PACKAGE)/.libs/$(PACKAGE).a 
../pthread/ppc$(BITS)/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR)
 endif
+endif
 
-- 
2.43.0


Reply via email to