slinky55/Binx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove concurrency

Browse Source 
If compiling with more than one task running at once,
there could be a concurrency on $(DEPSDIR)/tmp.d
Fixed that by making the temporary name unique using the target's name.
This commit is contained in:
ISSOtm
2018-12-03 17:30:56 +01:00
parent db344c6264
commit 7017914b51
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -70,10 +70,10 @@ $(DEPSDIR)/%.d: $(SRCDIR)/%.asm dummy
@set -e @set -e
@# Generate dependency file (side effect: also compiles!) @# Generate dependency file (side effect: also compiles!)
@# Output to a different file to not overwrite the old one on compilation failure (Make would think the compilation succeeded the next time) @# Output to a different file to not overwrite the old one on compilation failure (Make would think the compilation succeeded the next time)
$(RGBASM) -M $(@D)/tmp.d $(ASFLAGS) -o $(patsubst $(SRCDIR)/%.asm,$(OBJDIR)/%.o,$<) $< $(RGBASM) -M $@.tmp $(ASFLAGS) -o $(patsubst $(SRCDIR)/%.asm,$(OBJDIR)/%.o,$<) $<
@# Add all obj dependencies to the deps file too, so Make knows to remake it @# Add all obj dependencies to the deps file too, so Make knows to remake it
@sed 's,\($*\)\.o[ :]*,\1.o $@: ,g' < $(DEPSDIR)/tmp.d > $@ @sed 's,\($*\)\.o[ :]*,\1.o $@: ,g' < $@.tmp > $@
@rm $(DEPSDIR)/tmp.d @rm $@.tmp
# Include (and potentially remake) all dependency files # Include (and potentially remake) all dependency files
include $(patsubst $(SRCDIR)/%.asm,$(DEPSDIR)/%.d,$(ASMFILES)) include $(patsubst $(SRCDIR)/%.asm,$(DEPSDIR)/%.d,$(ASMFILES))