aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorEmilio Jesus Gallego Arias2019-03-12 12:07:56 +0100
committerEmilio Jesus Gallego Arias2019-03-12 12:17:22 +0100
commit430851db6db8ba30280f024ccbca5f6124287ab7 (patch)
tree0ec5fe772209c4cd30ed1ce55c5cf2e500b5bc34 /tools
parent591af507e606aef4bd97dc226567289b1a959cc1 (diff)
[dune] Add shim for coqtop.byte
We add a shim for running the byte version of coqtop. This fixes the Coq part of #9727 , the Dune part is still open at https://github.com/ocaml/dune/issues/108 but this PR includes a workaround. Unfortunately we have to introduce a small inefficiency in the build process as we build both byte and native versions of plugins for this work reliable. As this is a choice done during bootstrap it won't be easy to fix until we have our own `dune coqtop` command and we can control the rules depending on the final target. This should affect the `check` target so still fast builds should be possible, but if this is a problem we could add a `byteboot` target to help.
Diffstat (limited to 'tools')
-rw-r--r--tools/coq_dune.ml7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/coq_dune.ml b/tools/coq_dune.ml
index 62a871aa0e..98368d76ca 100644
--- a/tools/coq_dune.ml
+++ b/tools/coq_dune.ml
@@ -235,6 +235,12 @@ let scan_plugins m =
let dirs = Sys.(List.filter (fun f -> is_plugin_directory @@ bpath ["plugins";f]) Array.(to_list @@ readdir "plugins")) in
List.fold_left scan_mlg m dirs
+(* This will be removed when we drop support for Make *)
+let fix_cmo_cma file =
+ if String.equal Filename.(extension file) ".cmo"
+ then replace_ext ~file ~newext:".cma"
+ else file
+
(* Process .vfiles.d and generate a skeleton for the dune file *)
let parse_coqdep_line l =
match Str.(split (regexp ":") l) with
@@ -249,6 +255,7 @@ let parse_coqdep_line l =
the platform. Anyways, I hope we can link to coqdep instead
of having to parse its output soon, that should solve this
kind of issues *)
+ let deps = List.map fix_cmo_cma deps in
Some (String.split_on_char '/' dir, VO { target; deps; })
(* Otherwise a vio file, we ignore *)
| _ -> None