catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-20 07:18:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

firmware: proper makefile deps

Browse Source 
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
This commit is contained in:
Eric Wild
2021-07-16 15:09:50 +02:00
committed by laforge
parent e6a76c7bf4
commit 34317c1f32
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/Makefile
View File

@@ -197,7 +197,7 @@ OUTPUT := $(BIN)/$(OUTPUT)
# Rules # Rules
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
all: apps/$(APP)/usb_strings_generated.h $(BIN) $(OBJ) $(MEMORIES) all: $(BIN) $(OBJ) $(MEMORIES)
combined: $(OUTPUT)-combined.bin 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 $(OUTPUT)-combined.bin: $(BIN)/$(BOARD)-dfu-flash-padded.bin $(OUTPUT)-dfu.bin
cat $^ > $@ cat $^ > $@
$(BIN) $(OBJ): $(BIN) $(OBJ): apps/$(APP)/usb_strings_generated.h
mkdir -p $@ mkdir -p $@
usbstring/usbstring: usbstring/usbstring.c usbstring/usbstring: usbstring/usbstring.c