Merge PR #9523: Make boot flag into a normal option (no global flag).

Ack-by: SkySkimmer
Reviewed-by: ejgallego

4 files changed, 3 insertions, 7 deletions

diff --git a/lib/envars.ml b/lib/envars.ml
index b5036e7340..8a75d9a552 100644
--- a/lib/envars.ml
+++ b/lib/envars.ml
@@ -110,11 +110,11 @@ let set_user_coqlib path = coqlib := Some path
 
 (** coqlib is now computed once during coqtop initialization *)
 
-let set_coqlib ~fail =
+let set_coqlib ~boot ~fail =
   match !coqlib with
   | Some _ -> ()
   | None ->
-    let lib = if !Flags.boot then coqroot else guess_coqlib fail in
+    let lib = if boot then coqroot else guess_coqlib fail in
     coqlib := Some lib
 
 let coqlib () = Option.default "" !coqlib
diff --git a/lib/envars.mli b/lib/envars.mli
index ebf86d0650..21365c48f6 100644
--- a/lib/envars.mli
+++ b/lib/envars.mli
@@ -39,7 +39,7 @@ val datadir : unit -> string
 val configdir : unit -> string
 
 (** [set_coqlib] must be runned once before any access to [coqlib] *)
-val set_coqlib : fail:(string -> string) -> unit
+val set_coqlib : boot:bool -> fail:(string -> string) -> unit
 
 (** [set_user_coqlib path] sets the coqlib directory explicitedly. *)
 val set_user_coqlib : string -> unit
diff --git a/lib/flags.ml b/lib/flags.ml
index 29406ef275..9e0d7ed380 100644
--- a/lib/flags.ml
+++ b/lib/flags.ml
@@ -41,8 +41,6 @@ let with_options ol f x =
     let () = List.iter2 (:=) ol vl in
     Exninfo.iraise reraise
 
-let boot = ref false
-
 let record_aux_file = ref false
 
 let test_mode = ref false
diff --git a/lib/flags.mli b/lib/flags.mli
index b9c5e20f47..1066f31a8b 100644
--- a/lib/flags.mli
+++ b/lib/flags.mli
@@ -31,8 +31,6 @@
 
 (** Command-line flags  *)
 
-val boot : bool ref
-
 (** Set by coqtop to tell the kernel to output to the aux file; will
     be eventually removed by cleanups such as PR#1103 *)
 val record_aux_file : bool ref