Change in simtrace2[master]: firmware: proper makefile deps

laforge gerrit-no-reply at lists.osmocom.org
Mon Aug 2 09:22:48 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25081 )

Change subject: firmware: proper makefile deps
......................................................................

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
---
M firmware/Makefile
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  osmith: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/firmware/Makefile b/firmware/Makefile
index 76a58e1..2a14025 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -197,7 +197,7 @@
 #		Rules
 #-------------------------------------------------------------------------------
 
-all: apps/$(APP)/usb_strings_generated.h $(BIN) $(OBJ) $(MEMORIES)
+all: $(BIN) $(OBJ) $(MEMORIES)
 
 combined: $(OUTPUT)-combined.bin
 
@@ -208,7 +208,7 @@
 $(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

-- 
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25081
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I0bdf915deabeda861f6398e654764918e58a64c2
Gerrit-Change-Number: 25081
Gerrit-PatchSet: 7
Gerrit-Owner: Hoernchen <ewild at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210802/1a8726d6/attachment.htm>


More information about the gerrit-log mailing list