Have only one dune rule calling configure

3 files changed, 3 insertions, 15 deletions

diff --git a/config/dune b/config/dune
index c146e7df67..a303774e17 100644
--- a/config/dune
+++ b/config/dune
@@ -7,7 +7,7 @@
 ; Dune doesn't use configure's output, but it is still necessary for
 ; some Coq files to work; will be fixed in the future.
 (rule
- (targets coq_config.ml coq_config.py Makefile)
+ (targets coq_config.ml coq_config.py Makefile dune.c_flags)
  (mode fallback)
  (deps %{project_root}/configure.ml %{project_root}/dev/ocamldebug-coq.run (env_var COQ_CONFIGURE_PREFIX))
  (action (chdir %{project_root} (run %{ocaml} configure.ml -no-ask -native-compiler no))))
diff --git a/configure.ml b/configure.ml
index a53292b4cf..411578445c 100644
--- a/configure.ml
+++ b/configure.ml
@@ -1216,7 +1216,7 @@ let write_dune_c_flags f =
   close_out o;
   Unix.chmod f 0o444
 
-let _ = try write_dune_c_flags "kernel/byterun/dune.c_flags" with _ -> ()
+let _ = write_dune_c_flags "config/dune.c_flags"
 
 let write_macos_metadata exec =
   let f = "config/Info-"^exec^".plist" in
diff --git a/kernel/byterun/dune b/kernel/byterun/dune
index d0145176ea..8d8374a603 100644
--- a/kernel/byterun/dune
+++ b/kernel/byterun/dune
@@ -1,20 +1,8 @@
-; Dune doesn't use configure's output, but it is still necessary for
-; some Coq files to work; will be fixed in the future.
-(rule
- (targets dune.c_flags)
- (mode fallback)
- (deps %{project_root}/configure.ml %{project_root}/dev/ocamldebug-coq.run (env_var COQ_CONFIGURE_PREFIX))
- (action (chdir %{project_root} (run %{ocaml} configure.ml -no-ask -native-compiler no))))
-
-(env
- (dev     (c_flags (:include dune.c_flags)))
- (release (c_flags (:include dune.c_flags)))
- (ireport (c_flags (:include dune.c_flags))))
-
 (library
  (name byterun)
  (synopsis "Coq's Kernel Abstract Reduction Machine [C implementation]")
  (public_name coq.vm)
+ (c_flags (:include %{project_root}/config/dune.c_flags))
  (c_names coq_fix_code coq_memory coq_values coq_interp))
 
 (rule