diff options
| author | Emilio Jesus Gallego Arias | 2019-02-08 18:53:55 +0100 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2019-02-08 18:53:55 +0100 |
| commit | 92df98da23057a47a6cd2053618fd97efe54ba30 (patch) | |
| tree | 1ebc2880fa850e5c095b064972158a940844a85f /tools | |
| parent | 3b9d338c751acd6694038b30e0c40637449df86a (diff) | |
| parent | 6c06f36b2dd1812454d40cbde1da28e1ea8be67e (diff) | |
Merge PR #9523: Make boot flag into a normal option (no global flag).
Ack-by: SkySkimmer
Reviewed-by: ejgallego
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/coq_makefile.ml | 2 | ||||
| -rw-r--r-- | tools/coqdep.ml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml index 5fd894e908..5526970d3f 100644 --- a/tools/coq_makefile.ml +++ b/tools/coq_makefile.ml @@ -431,7 +431,7 @@ let _ = check_overlapping_include project; - Envars.set_coqlib ~fail:(fun x -> Printf.eprintf "Error: %s\n" x; exit 1); + Envars.set_coqlib ~boot:false ~fail:(fun x -> Printf.eprintf "Error: %s\n" x; exit 1); let ocm = Option.cata open_out stdout project.makefile in generate_makefile ocm conf_file local_file (prog :: args) project; diff --git a/tools/coqdep.ml b/tools/coqdep.ml index 4e80caa4cc..5f8cc99ed1 100644 --- a/tools/coqdep.ml +++ b/tools/coqdep.ml @@ -530,7 +530,8 @@ let coqdep () = add_rec_dir_import (fun _ -> add_caml_known) "theories" ["Coq"]; add_rec_dir_import (fun _ -> add_caml_known) "plugins" ["Coq"]; end else begin - Envars.set_coqlib ~fail:(fun msg -> raise (CoqlibError msg)); + (* option_boot is actually always false in this branch *) + Envars.set_coqlib ~boot:!option_boot ~fail:(fun msg -> raise (CoqlibError msg)); let coqlib = Envars.coqlib () in add_rec_dir_import add_coqlib_known (coqlib//"theories") ["Coq"]; add_rec_dir_import add_coqlib_known (coqlib//"plugins") ["Coq"]; |