ocamlbuild: when tag "native" is set, use ocamlopt instead of ocamlc for .mli->.cmi

This was requested (with a patch proposal) by "jessicah" in
PR#4613. Given that the effect of such changes are hard to test,
I commit this in trunk only, not version-4.01, to give more time to
detect eventual problems.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13787 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 12 insertions, 0 deletions

diff --git a/ocamlbuild/ocaml_compiler.ml b/ocamlbuild/ocaml_compiler.ml
index 218842feb..4b2a761bf 100644
--- a/ocamlbuild/ocaml_compiler.ml
+++ b/ocamlbuild/ocaml_compiler.ml
@@ -128,6 +128,18 @@ let byte_compile_ocaml_interf mli cmi env build =
   prepare_compile build mli;
   ocamlc_c (tags_of_pathname mli++"interf") mli cmi
 
+(* given that .cmi can be built from either ocamlc and ocamlopt, this
+   "agnostic" rule chooses either compilers depending on whether the
+   "native" tag is present. This was requested during PR#4613 as way
+   to enable using ocamlbuild in environments where only ocamlopt is
+   available, not ocamlc. *)
+let compile_ocaml_interf mli cmi env build =
+  let mli = env mli and cmi = env cmi in
+  prepare_compile build mli;
+  let tags = tags_of_pathname mli++"interf" in 
+  let comp_c = if Tags.mem "native" tags then ocamlopt_c else ocamlc_c in
+  comp_c tags mli cmi
+
 let byte_compile_ocaml_implem ?tag ml cmo env build =
   let ml = env ml and cmo = env cmo in
   prepare_compile build ml;