Skip to content

Commit 7b80fbe

Browse files
committed
Don't build flexspin/flexcc twice during parallel build
Not only is this a waste, but if the second build of a file was written while the first was still being read, it would cause the build to fail.
1 parent d1f2108 commit 7b80fbe

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

Makefile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,7 @@ bin/loadp2: loadp2/build/loadp2
225225
mkdir -p bin
226226
cp $< $@
227227

228-
spin2cpp/build/flexspin:
229-
$(MAKE) -C spin2cpp OPT=-O1
230-
spin2cpp/build/flexcc:
228+
spin2cpp/build/flexspin spin2cpp/build/flexcc:
231229
$(MAKE) -C spin2cpp OPT=-O1
232230

233231
proploader-$(OS)-build/bin/proploader: bin/flexspin
@@ -264,9 +262,7 @@ bin/loadp2.exe: loadp2/build-win32/loadp2.exe
264262
$(SIGNPC) bin/loadp2
265263
mv bin/loadp2.signed.exe bin/loadp2.exe
266264

267-
spin2cpp/build-win32/flexspin.exe:
268-
$(MAKE) -C spin2cpp CROSS=win32
269-
spin2cpp/build-win32/flexcc.exe:
265+
spin2cpp/build-win32/flexspin.exe spin2cpp/build-win32/flexcc.exe:
270266
$(MAKE) -C spin2cpp CROSS=win32
271267

272268
ifneq ($(OS),msys)
@@ -307,9 +303,7 @@ bin/flexcc.mac: spin2cpp/build-macosx/flexcc
307303
cp $< $@
308304
$(SIGNMAC) $@
309305

310-
spin2cpp/build-macosx/flexspin:
311-
$(MAKE) -C spin2cpp CROSS=macosx
312-
spin2cpp/build-macosx/flexcc:
306+
spin2cpp/build-macosx/flexspin spin2cpp/build-macosx/flexcc:
313307
$(MAKE) -C spin2cpp CROSS=macosx
314308

315309
loadp2/build-macosx/loadp2:

0 commit comments

Comments
 (0)