Merge PR #9560: [coqlib] Remove `-boot` option for setting the coqlib

Reviewed-by: SkySkimmer
Ack-by: ejgallego
Reviewed-by: gares

2 files changed, 4 insertions, 4 deletions

diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml
index 5526970d3f..4f01a6bd87 100644
--- a/tools/coq_makefile.ml
+++ b/tools/coq_makefile.ml
@@ -424,15 +424,15 @@ let _ =
   end;
 
   let project = ensure_root_dir project in
-  
+
   if project.install_kind <> (Some CoqProject_file.NoInstall) then begin
     warn_install_at_root_directory project;
   end;
 
   check_overlapping_include project;
 
-  Envars.set_coqlib ~boot:false ~fail:(fun x -> Printf.eprintf "Error: %s\n" x; exit 1);
-  
+  Envars.set_coqlib ~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;
   close_out ocm;
diff --git a/tools/coqdep.ml b/tools/coqdep.ml
index 5f8cc99ed1..66f1f257b8 100644
--- a/tools/coqdep.ml
+++ b/tools/coqdep.ml
@@ -531,7 +531,7 @@ let coqdep () =
     add_rec_dir_import (fun _ -> add_caml_known) "plugins" ["Coq"];
   end else begin
     (* option_boot is actually always false in this branch *)
-    Envars.set_coqlib ~boot:!option_boot ~fail:(fun msg -> raise (CoqlibError msg));
+    Envars.set_coqlib ~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"];