From ba92728f756d53d6bb1f8bae653aa8f42797ee97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Date: Tue, 1 Sep 2020 11:32:09 +0200 Subject: [PATCH] aix: remove libgomp and libatomic archives before creating FAT archives libgomp and libatomic might be in use during the build. Thus, ar commands will failed to add new objetcs to it as the file is considered busy. Deleting it and recreating it with both architectures fixes that. libatomic/Changelog: 2020-08-17 Clement Chigot * config/t-aix: Deleting libatomic before creating FAT library. libgomp/Changelog: 2020-08-17 Clement Chigot * config/t-aix: Deleting libgomp before creating FAT library. --- libatomic/config/t-aix | 3 +++ libgomp/config/t-aix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/libatomic/config/t-aix b/libatomic/config/t-aix index 08607727574..f2163f1de8e 100644 --- a/libatomic/config/t-aix +++ b/libatomic/config/t-aix @@ -5,6 +5,9 @@ BITS=$(shell if test -z "`$(CC) -x c -E /dev/null -g3 -o - | grep 64BIT`" ; then MAJOR=1 ARX=$(shell echo $(AR) | sed -e 's/-X[^ ]*//g') all-local: + rm .libs/$(PACKAGE).a ../pthread/$(PACKAGE)/.libs/$(PACKAGE).a + $(ARX) -X32_64 rc .libs/$(PACKAGE).a .libs/$(PACKAGE).so.$(MAJOR) + $(ARX) -X32_64 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 diff --git a/libgomp/config/t-aix b/libgomp/config/t-aix index 35bff8bb019..3bc16e439f5 100644 --- a/libgomp/config/t-aix +++ b/libgomp/config/t-aix @@ -4,6 +4,9 @@ BITS=$(shell if test -z "`$(CC) -x c -E /dev/null -g3 -o - | grep 64BIT`" ; then ARX=$(shell echo $(AR) | sed -e 's/-X[^ ]*//g') MAJOR=$(firstword $(subst :, ,$(libtool_VERSION))) all-local: + rm .libs/$(PACKAGE).a ../pthread/$(PACKAGE)/.libs/$(PACKAGE).a + $(ARX) -X32_64 rc .libs/$(PACKAGE).a .libs/$(PACKAGE).so.$(MAJOR) + $(ARX) -X32_64 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 -- 2.25.0