@@ -43,14 +43,11 @@ release:snapshot
43
43
# Carefully check the stored data if it is platform independent
44
44
45
45
./bin/bspack : ./bin/bspack.mli ./bin/bspack.ml
46
- $(NATIVE ) -w -a -I bin -I +compiler-libs ocamlcommon.cmxa unix.cmxa $^ -o $@
46
+ $(NATIVE ) -w -a -I bin unix.cmxa $^ -o $@
47
47
48
48
./bin/bsppx : ./bin/bs_ppx.mli ./bin/bs_ppx.ml
49
49
$(NATIVE ) -g -inline 1000 -linkall -w -a -I bin -I +compiler-libs ocamlcommon.cmxa $^ -o $@
50
50
51
- # # order matters
52
- _build/bspack : _build/ext/ext.cmxa _build/common/common.cmxa _build/depends/depends.cmxa _build/bspack_main.cmx
53
- $(NATIVE ) -I +compiler-libs ocamlcommon.cmxa unix.cmxa $^ -o $@
54
51
55
52
snapshot : ./bin/bspack snapshotcmj
56
53
$(MAKE ) snapshotml
@@ -64,12 +61,13 @@ snapshotcmj:
64
61
ocamlbuild -cflags $(OCAMLBUILD_CFLAGS ) -lflags -I,+compiler-libs,ocamlcommon.cmxa js_pack.native --
65
62
66
63
# git diff bin/bspack.ml
64
+ # bootbspack requires ../ocaml has parser, lexer processed by ocamlyacc and ocamllex
67
65
bootbspack : ./bin/bspack
68
66
@echo " Bootstrap bspack"
69
- ./bin/bspack -I ext -I common -I depends -bs-main bspack_main.ml -o bin/bspack.ml
70
- $(NATIVE ) -w -40 -I +compiler-libs unix.cmxa ocamlcommon.cmxa -I bin bin/bspack.mli bin/bspack.ml -o bin/bspack
67
+ ./bin/bspack -bs-log-mllib bin/bspack.mllib -I ../ocaml/parsing/ -I ../ocaml/utils/ - I ext -I common -I depends -bs-main bspack_main.ml -o bin/bspack.ml
68
+ $(NATIVE ) -w -40 unix.cmxa -I bin bin/bspack.mli bin/bspack.ml -o bin/bspack
71
69
@echo " Using the bootstrapped bspack to genreate new bspack.ml: ` date` "
72
- ./bin/bspack -I ext -I common -I depends -bs-main bspack_main.ml -o bin/bspack.ml
70
+ ./bin/bspack -bs-log-mllib bin/bspack.mllib -I ../ocaml/parsing/ -I ../ocaml/utils/ - I ext -I common -I depends -bs-main bspack_main.ml -o bin/bspack.ml
73
71
@echo " Bootstrap seems finished, please check diffs in bspack"
74
72
@echo " Rebuilding bspack"
75
73
make -B ./bin/bspack
0 commit comments