fix: don't take build lock for coq top --no-build (ocaml#10547)

Signed-off-by: Zongyuan Liu <liuzongyuan0505@gmail.com>
emillon · May 29, 2024 · 86b8a6d · 86b8a6d
1 parent 7af2a84
commit 86b8a6d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/bin/coq/coqtop.ml b/bin/coq/coqtop.ml
@@ -18,7 +18,7 @@ let man =
 let info = Cmd.info "top" ~doc ~man
 
 let term =
-  let+ builder = Common.Builder.term
+  let+ default_builder = Common.Builder.term
   and+ context =
     let doc = "Run the Coq toplevel in this build context." in
     Common.context_arg ~doc
@@ -34,7 +34,12 @@ let term =
       & flag
       & info [ "no-build" ] ~doc:"Don't rebuild dependencies before executing.")
   in
-  let common, config = Common.init builder in
+  let common, config =
+    let builder =
+      if no_rebuild then Common.Builder.forbid_builds default_builder else default_builder
+    in
+    Common.init builder
+  in
   let coq_file_arg = Common.prefix_target common coq_file_arg |> Path.Local.of_string in
   let coqtop, argv, env =
     Scheduler.go ~common ~config

diff --git a/doc/changes/10547.md b/doc/changes/10547.md
@@ -0,0 +1,2 @@
+- Don't try to take build lock when running `coq top --no-build` (#10547,
+  fixes #7671, @lzy0505)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Don't try to take build lock when running `coq top --no-build` (#10547,
		fixes #7671, @lzy0505)