diff options
| author |  Pierre Letouzey <pierre.letouzey@inria.fr> | 2014-03-02 00:17:29 +0100 |
|---|---|---|
| committer | Pierre Letouzey <pierre.letouzey@inria.fr> | 2014-03-02 20:00:03 +0100 |
| commit | 9130ea9cbc657cd7adf02830e40a89f6de3953f3 (patch) | |
| tree | e0152f4442dadf8cc49f12a2cc42817515691461 /Makefile.build | |
| parent | f694544d016b085b3cd10007b9f7716ae2c3b022 (diff) | |
Set officially the minimal OCaml requirement to 3.12.1
Anyway, a few syntactic features of 3.12 were already used here and
there (e.g. local opening via Foo.(...), or the record shortcut
{ field; ... }). Hence compiling with 3.11 wasn't working anymore.
Already take advantage of the following 3.12.1 features :
- "module type of ..." in CArray, CList, CString ...
- "ocamldep -ml-synonym" : no need anymore to hack the ocamldep output
via our coqdep to localize the .ml4 modules :-)
The -ml-synonym option (+ various bugfixes) is the reason for asking
3.12.1 directly and not just 3.12.0. After all, if debian stable is
providing 3.12.1, then everybody has it ;-)
Diffstat (limited to 'Makefile.build')
| -rw-r--r-- | Makefile.build | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.build b/Makefile.build index f8895b2ed..7bfc6f953 100644 --- a/Makefile.build +++ b/Makefile.build @@ -106,7 +106,7 @@ OCAMLOPT := $(OCAMLOPT) $(CAMLFLAGS) BYTEFLAGS=$(CAMLDEBUG) $(USERFLAGS) OPTFLAGS=$(CAMLDEBUGOPT) $(CAMLTIMEPROF) $(USERFLAGS) -DEPFLAGS= $(LOCALINCLUDES) +DEPFLAGS= $(LOCALINCLUDES) -I ide -I ide/utils define bestocaml $(if $(OPT),\ @@ -928,10 +928,10 @@ endif $(SHOW)'CAMLP4DEPS $<' $(HIDE)echo "$*.ml: $(if $(NO_RECOMPILE_ML4),$(ORDER_ONLY_SEP)) $(call CAMLP4DEPS,$<)" $(TOTARGET) -# We now use coqdep_boot to wrap around ocamldep -modules, since it is aware -# of .ml4 files +# Since OCaml 3.12.1, we could use again ocamldep directly, thanks to +# the option -ml-synonym -OCAMLDEP_NG = $(COQDEPBOOT) -mldep $(OCAMLDEP) +OCAMLDEP_NG = $(OCAMLDEP) -slash -ml-synonym .ml4 checker/%.ml.d: $(D_DEPEND_BEFORE_SRC) checker/%.ml $(D_DEPEND_AFTER_SRC) $(COQDEPBOOT) $(GENFILES) $(SHOW)'OCAMLDEP $<' |