[coq] Add "-q" to default flags.

Fixes #3924 , and a bug where `:standard` was not properly set in theory flags, as they should be inherited from the ones set in the profile; thanks Rudi Gringerb. Signed-off-by: Emilio Jesus Gallego Arias <[email protected]>
ocaml · Nov 13, 2020 · 52d3033 · 52d3033
1 parent 4c0e6b8
commit 52d3033
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -74,6 +74,8 @@ Unreleased
 
 - Tweak auto-formatting of `dune` files to improve readability. (#3928, @nojb)
 
+- [coq] Add `-q` flag to default `coqc` flags , fixes #3924, (#3931 , @ejgallego)
+
 2.7.1 (2/09/2020)
 -----------------
 

diff --git a/src/dune_rules/coq_rules.ml b/src/dune_rules/coq_rules.ml
@@ -101,15 +101,14 @@ module Context = struct
     let dir = Path.build (snd t.coqc) in
     Command.run ~dir ?stdout_to (fst t.coqc) args
 
+  let standard_coq_flags = Build.return [ "-q" ]
+
   let coq_flags t =
-    Build.(
-      map ~f:List.concat
-        (all
-           [ Expander.expand_and_eval_set t.expander t.profile_flags
-               ~standard:(Build.return [])
-           ; Expander.expand_and_eval_set t.expander t.buildable.flags
-               ~standard:(Build.return [])
-           ]))
+    let standard = standard_coq_flags in
+    let standard =
+      Expander.expand_and_eval_set t.expander t.profile_flags ~standard
+    in
+    Expander.expand_and_eval_set t.expander t.buildable.flags ~standard
 
   let theories_flags =
     let setup_theory_flag lib =