Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-19 13:49:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve Makefile prerequisites

Browse source 
Since commit 15a8f2cfe5 the build order
must be as follows:

	1. Bootstrap cyclone.scm using a pre-existing compiler.
	2. Using cyclone from the previous step, build all libraries.
	3. Using the artifacts from the previous two steps, build
	   icyc, examples, and tests.

This commit updates the Makefile prerequisites accordingly to reflect
this change in build order. Otherwise, Cyclone does not correctly
compile in parallel build mode with `-jN`.
This commit is contained in:
Sören Tempel 2021-08-14 00:29:32 +02:00
parent 5fe773865c
commit e08e7d3958
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -150,12 +150,12 @@ doc :
.PHONY: clean full bench bootstrap tags indent debug test doc .PHONY: clean full bench bootstrap tags indent debug test doc
$(TESTS) : %: %.scm $(TESTS) : %: %.scm cyclone libs
$(CYCLONE_LOCAL) -I . $< $(CYCLONE_LOCAL) -I . $<
./$@ ./$@
rm -rf $@ rm -rf $@
$(EXAMPLES) : %: %.scm $(EXAMPLES) : %: %.scm cyclone libs
$(CYCLONE_LOCAL) $< $(CYCLONE_LOCAL) $<
game-of-life : game-of-life :
@ -166,13 +166,13 @@ hello-library/hello :
libs : $(COBJECTS) libs : $(COBJECTS)
$(COBJECTS) : %.o: %.sld $(COBJECTS) : %.o: %.sld cyclone
$(CYCLONE_LOCAL) $< $(CYCLONE_LOCAL) $<
cyclone : cyclone.scm $(CYC_RT_LIB) $(CYC_BN_LIB) cyclone : cyclone.scm $(CYC_RT_LIB) $(CYC_BN_LIB)
$(CYCLONE_SYSTEM) cyclone.scm $(CYCLONE_SYSTEM) cyclone.scm
icyc : icyc.scm $(CYC_RT_LIB) $(CYC_BN_LIB) icyc : icyc.scm $(CYC_RT_LIB) $(CYC_BN_LIB) cyclone libs
$(CYCLONE_LOCAL) $< $(CYCLONE_LOCAL) $<
$(CYC_RT_LIB) : $(CFILES) $(HEADERS) $(CYC_BN_LIB) $(CYC_RT_LIB) : $(CFILES) $(HEADERS) $(CYC_BN_LIB)