On 02/02/2024 10.30, Andrew Jones wrote:
On Fri, Feb 02, 2024 at 04:57:32PM +1000, Nicholas Piggin wrote:
Using all prerequisites for the source file results in the build
dying on the second time around with:
gcc: fatal error: cannot specify ‘-o’ with ‘-c’, ‘-S’ or ‘-E’ with multiple files
This is due to auxinfo.h becoming a prerequisite after the first
build recorded the dependency.
D'oh, of course I only tried to run "make" once when testing that patch :-/
diff --git a/arm/Makefile.common b/arm/Makefile.common
index 54cb4a63..c2ee568c 100644
--- a/arm/Makefile.common
+++ b/arm/Makefile.common
@@ -71,7 +71,7 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libeabi)
ifeq ($(CONFIG_EFI),y)
%.aux.o: $(SRCDIR)/lib/auxinfo.c
- $(CC) $(CFLAGS) -c -o $@ $^ \
+ $(CC) $(CFLAGS) -c -o $@ $< \
-DPROGNAME=\"$(@:.aux.o=.efi)\" -DAUXFLAGS=$(AUXFLAGS)
There are two instances of the %.aux.o target in arm/Makefile.common. We
need to fix both. We can actually pull the target out of the two arms of
the CONFIG_EFI if-else, though, by changing the .efi/.flat to .$(exe).
I went ahead and pushed this patch with the trivial fix for the else-branch
to the repo to unbreak the build. If you think it's worthwhile to unify the
target, please provide a patch to do so, thanks!
Thomas
