From 34317c1f3243ecd3d462268fffe90ddbf7648570 Mon Sep 17 00:00:00 2001 From: Eric Wild Date: Fri, 16 Jul 2021 15:09:50 +0200 Subject: [PATCH] firmware: proper makefile deps Single threaded evaluation is (assumed to be!) left to right, depth first - but with concurrent make using -j this breaks, because the actual usb string header is generated after the attempt to concurrently compile the code that needs it, since there is no explicit order among the all: dependencies. This is fixed by properly adding a dependency on that header. Change-Id: I0bdf915deabeda861f6398e654764918e58a64c2 --- firmware/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firmware/Makefile b/firmware/Makefile index 76a58e11..2a140258 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -197,7 +197,7 @@ OUTPUT := $(BIN)/$(OUTPUT) # Rules #------------------------------------------------------------------------------- -all: apps/$(APP)/usb_strings_generated.h $(BIN) $(OBJ) $(MEMORIES) +all: $(BIN) $(OBJ) $(MEMORIES) combined: $(OUTPUT)-combined.bin @@ -208,7 +208,7 @@ $(BIN)/$(BOARD)-dfu-flash-padded.bin: $(BIN)/$(BOARD)-dfu-flash.bin $(OUTPUT)-combined.bin: $(BIN)/$(BOARD)-dfu-flash-padded.bin $(OUTPUT)-dfu.bin cat $^ > $@ -$(BIN) $(OBJ): +$(BIN) $(OBJ): apps/$(APP)/usb_strings_generated.h mkdir -p $@ usbstring/usbstring: usbstring/usbstring.c