From 25bc42e754e76f7dd45048bcfb139fdba22e3e29 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 26 May 2020 13:08:35 +0930 Subject: [PATCH] powerpc: Fix Makefile rule when linking. The linker script was included in the "$^" inputs, causing the build to fail: LINK build/firmware.elf powerpc64le-linux-gnu-ld: error: linker script file 'powerpc.lds' appears multiple times As a fix the linker script is left as a dependency of the elf, but only the object files are linked. --- ports/powerpc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/powerpc/Makefile b/ports/powerpc/Makefile index 7aa4f1449c..2e4dd0fd02 100644 --- a/ports/powerpc/Makefile +++ b/ports/powerpc/Makefile @@ -52,7 +52,7 @@ $(BUILD)/_frozen_mpy.c: frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h $(BUILD)/firmware.elf: $(OBJ) powerpc.lds $(ECHO) "LINK $@" - $(Q)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS) + $(Q)$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $(Q)$(SIZE) $@ $(BUILD)/firmware.bin: $(BUILD)/firmware.elf