From 4c933a1d018cdd4d9528441652794971a8a806bc Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Tue, 25 Dec 2018 10:33:35 -0500 Subject: [PATCH] build: Properly generate build dependency for autogenerated bitmap .h files * bmp2rb generated a .h file that rockbox .c files used. * .h files in .c files were used to generate dependency graphs for make * When Make saw the .h file for the bitmap, it didn't know how what to do with them * Only arose in parallel builds Fixed this by adding explicit dependencies for the .h files as part of the existing 'bmpdepfile' function. Solves the Xduoo X3 bootloader build failure that I could trigger 100% of the time by using 'make -j8' Change-Id: I6b3e78dde26c820a3b6c7c286e7d6c981b8e01fc --- tools/functions.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/functions.make b/tools/functions.make index 806e1a2f3e..a2c715e9e1 100644 --- a/tools/functions.make +++ b/tools/functions.make @@ -55,8 +55,10 @@ bmpdepfile = $(SILENT) \ for each in $(2); do \ obj=`echo $$each | sed -e 's/\.bmp/.o/' -e 's:$(ROOTDIR):$(BUILDDIR):'`; \ src=`echo $$each | sed -e 's/\.bmp/.c/' -e 's:$(ROOTDIR):$(BUILDDIR):'`; \ + hdr=`echo $$each | sed -e 's/.*\/\(.*\)\..*\.bmp/bitmaps\/\1\.h/'`; \ echo $$obj: $$src; \ echo $$src: $$each; \ + echo $(BUILDDIR)/$$hdr: $$src; \ done \ >> $(1)