diff options
| -rw-r--r-- | Makefile.build | 4 | ||||
| -rw-r--r-- | config/Makefile.template | 3 | ||||
| -rw-r--r-- | parsing/grammar.mllib | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.build b/Makefile.build index 60156f509..39df58c17 100644 --- a/Makefile.build +++ b/Makefile.build @@ -706,10 +706,10 @@ dev/printers.cma: | dev/printers.mllib.d parsing/grammar.cma: | parsing/grammar.mllib.d $(SHOW)'Testing $@' @touch test.ml4 - $(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) $^ -impl" -impl test.ml4 -o test-grammar + $(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) -I $(CAMLLIB) unix.cma $^ -impl" -impl test.ml4 -o test-grammar @rm -f test-grammar test.* $(SHOW)'OCAMLC -a $@' - $(HIDE)$(OCAMLC) $(BYTEFLAGS) $^ -linkall -a -o $@ + $(HIDE)$(OCAMLC) $(BYTEFLAGS) unix.cma $^ -linkall -a -o $@ # toplevel/mltop.ml4 (ifdef Byte) diff --git a/config/Makefile.template b/config/Makefile.template index 6f9fac3c1..4d45f1b4e 100644 --- a/config/Makefile.template +++ b/config/Makefile.template @@ -49,6 +49,9 @@ CAMLP4BIN="CAMLP4BINDIRECTORY" # Ocaml version number CAMLVERSION=CAMLTAG +# Ocaml libraries +CAMLLIB="CAMLLIBDIRECTORY" + # Ocaml .h directory CAMLHLIB="CAMLLIBDIRECTORY" diff --git a/parsing/grammar.mllib b/parsing/grammar.mllib index 9e714352b..4356db844 100644 --- a/parsing/grammar.mllib +++ b/parsing/grammar.mllib @@ -1,5 +1,6 @@ Coq_config +Profile Pp_control Pp Compat |