aboutsummaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorEric Wild <ewild@sysmocom.de>2021-07-16 15:09:50 +0200
committerlaforge <laforge@osmocom.org>2021-08-02 09:22:46 +0000
commit34317c1f3243ecd3d462268fffe90ddbf7648570 (patch)
tree184f40ca6be30b6a26b94aa63aaa1256b1532ceb /firmware
parente6a76c7bf40d93c20dd5117806c39e3f8b0e6ad7 (diff)
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
Diffstat (limited to 'firmware')
-rw-r--r--firmware/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index 76a58e1..2a14025 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