From 28a97a2ae5a684e3645c8f69cd55c1369bf9f3a3 Mon Sep 17 00:00:00 2001 From: Jakub Czapiga Date: Tue, 18 Jan 2022 14:22:22 +0000 Subject: libpayload/Makefile.inc: Fix ar calls to support llvm-ar llvm-ar does not support "open" script command, and fails with an error. This patch fixes it by removing lines `$(AR) rc ` and it puts them as "addmod" commands. This way all object files and archives can be packed into one archive. Change-Id: I0c53d1d613b5edc321e268d1d996fac3146680f8 Signed-off-by: Jakub Czapiga Reviewed-on: https://review.coreboot.org/c/coreboot/+/61182 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi Reviewed-by: Julius Werner --- payloads/libpayload/Makefile.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'payloads') diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index c540bb7dbce2..01c3ede4fc99 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -95,13 +95,11 @@ includes-handler= \ $(obj)/libpayload.a: $(foreach class,$(libraries),$$($(class)-objs)) printf " AR $(subst $(CURDIR)/,,$(@))\n" - $(AR) rc $@ $(filter-out %.a,$^) - printf "open $@\n$(foreach lib,$(filter %.a,$^),addlib $(lib)\n)save\nend\n" | $(AR) -M + printf "create $@\n$(foreach objc,$(filter-out %.a,$^),addmod $(objc)\n)$(foreach lib,$(filter %.a,$^),addlib $(lib)\n)save\nend\n" | $(AR) -M $(obj)/%.a: $$(%-objs) printf " AR $(subst $(CURDIR)/,,$(@))\n" - $(AR) rc $@ $(filter-out %.a,$^) - printf "open $@\n$(foreach lib,$(filter %.a,$^),addlib $(lib)\n)save\nend\n" | $(AR) -M + printf "create $@\n$(foreach objc,$(filter-out %.a,$^),addmod $(objc)\n)$(foreach lib,$(filter %.a,$^),addlib $(lib)\n)save\nend\n" | $(AR) -M $(obj)/head.o: $(obj)/arch/$(ARCHDIR-y)/head.head.o.o printf " CP $(subst $(CURDIR)/,,$(@))\n" -- cgit v1.2.3