diff options
| author |  Stephane Glondu <steph@glondu.net> | 2014-01-19 15:09:23 +0100 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2014-01-19 15:09:23 +0100 |
| commit | d2c5c5e616a6e118291fe1ce9965c731adac03a8 (patch) | |
| tree | 7b000ad50dcc45ff1c63768a983cded1e23a07ca /myocamlbuild.ml | |
| parent | db38bb4ad9aff74576d3b7f00028d48f0447d5bd (diff) | |
Imported Upstream version 8.4pl3dfsgupstream/8.4pl3dfsg
Diffstat (limited to 'myocamlbuild.ml')
| -rw-r--r-- | myocamlbuild.ml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/myocamlbuild.ml b/myocamlbuild.ml index 7a214bcd..5b873fce 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -76,13 +76,15 @@ end let use_camlp5 = (Coq_config.camlp4 = "camlp5") +let camlp4lib = if w32 then w32lib^"ocaml/camlp5" else Coq_config.camlp4lib + let camlp4args = if use_camlp5 then [A "pa_extend.cmo";A "q_MLast.cmo";A "pa_macro.cmo"] else [] let ocaml = A Coq_config.ocaml let camlp4o = S ((A Coq_config.camlp4o) :: camlp4args) -let camlp4incl = S[A"-I"; A Coq_config.camlp4lib] +let camlp4incl = S[A"-I"; A camlp4lib] let camlp4compat = Sh Coq_config.camlp4compat let opt = (Coq_config.best = "opt") let ide = Coq_config.has_coqide @@ -301,7 +303,7 @@ let extra_rules () = begin mlp_cmo "tools/compat5b"; end; - ocaml_lib ~extern:true ~dir:Coq_config.camlp4lib ~tag_name:"use_camlpX" + ocaml_lib ~extern:true ~dir:camlp4lib ~tag_name:"use_camlpX" ~byte:true ~native:true (if use_camlp5 then "gramlib" else "camlp4lib"); (** Special case of toplevel/mltop.ml4: @@ -322,7 +324,7 @@ let extra_rules () = begin Cmd (S [!Options.ocamlc; A"-c"; A"-pp"; Quote (S [camlp4o; T(tags_of_pathname ml4 ++ "p4mod"); A"-DByte";A"-DHasDynlink";camlp4compat;A"-impl"]); - A"-rectypes"; camlp4incl; incl ml4; A"-impl"; P ml4])); + A"-rectypes"; A"-impl"; P ml4])); (** All caml files are compiled with -rectypes and +camlp4/5 and ide files need +lablgtk2 *) |