diff options
| author | Théo Zimmermann | 2018-11-06 14:17:01 +0100 |
|---|---|---|
| committer | Théo Zimmermann | 2018-11-06 14:17:01 +0100 |
| commit | 34a9ce15d39a5adeef38f77289eb66ac296af68c (patch) | |
| tree | 02901b13f2e5b85d7dff9fd9b446a29e06a0c0a5 | |
| parent | 11879733b7f2d2554bcfc7a851479ec8adc3e97e (diff) | |
| parent | 33cc626936d2c05a98ebf6d2e31bda7217c030b1 (diff) | |
Merge PR #8903: [dune] Add to vo rules explicit location of coqlib in boot mode.
| -rw-r--r-- | tools/coq_dune.ml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/coq_dune.ml b/tools/coq_dune.ml index f94da14cd0..84850e7158 100644 --- a/tools/coq_dune.ml +++ b/tools/coq_dune.ml @@ -175,8 +175,10 @@ let pp_vo_dep dir fmt vo = let deps = List.map (fun s -> bpath [sdir;s]) (edep @ vo.deps) in (* The source file is also corrected as we will call coqtop from the top dir *) let source = bpath (dir @ [Filename.(remove_extension vo.target) ^ ".v"]) in + (* We explicitly include the location of coqlib to avoid tricky issues with coqlib location *) + let libflag = "-coqlib %{project_root}" in (* The final build rule *) - let action = sprintf "(chdir %%{project_root} (run coqtop -boot %s %s -compile %s))" eflag cflag source in + let action = sprintf "(chdir %%{project_root} (run coqtop -boot %s %s %s -compile %s))" libflag eflag cflag source in pp_rule fmt [vo.target] deps action let pp_ml4_dep _dir fmt ml = |