unify ocamlpack

rescript-lang · Aug 10, 2016 · 0cbd8fb · 0cbd8fb
1 parent 9c688ae
commit 0cbd8fb
Show file tree

Hide file tree

Showing 16 changed files with 2,817 additions and 1,025 deletions.
diff --git a/jscomp/Makefile b/jscomp/Makefile
@@ -39,7 +39,8 @@ release:snapshot
 ./bin/ocamlpack: ./bin/ocamlpack.mli ./bin/ocamlpack.ml 
 	$(NATIVE) -w -a -I bin -I +compiler-libs ocamlcommon.cmxa unix.cmxa  $^ -o $@
 
-_build/ocamlpack: _build/ext/ext.cmxa _build/syntax/pack.cmxa _build/syntax/ocaml_pack_main.cmx
+## order matters
+_build/ocamlpack: _build/ext/ext.cmxa _build/common/common.cmxa  _build/syntax/pack.cmxa _build/syntax/ocaml_pack_main.cmx
 	$(NATIVE) -I +compiler-libs ocamlcommon.cmxa unix.cmxa $^ -o $@
 
 snapshot: ./bin/ocamlpack snapshotcmj