From ea68d3e92405760a453668c7f471e5c587884d80 Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Sat, 10 Nov 2018 19:52:19 +0100
Subject: coq_makefile: Fix ocamldep ignoring mlg files

If you have file1.mlg and file2.ml, with file2 depending on file1,
ocamldep was before generating file1.ml so wouldn't generate
[file2.cmx: file1.cmx] (ocamldep is silent on non-found dependencies).

This has been causing nondeterministic failures in quickchick
recently.

I guess it didn't come up in the past because ml4 files tend to be at
the end of the dependency chain.
---
 tools/CoqMakefile.in | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tools')

diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in
index e3fa0c24fe..92cc820483 100644
--- a/tools/CoqMakefile.in
+++ b/tools/CoqMakefile.in
@@ -719,6 +719,9 @@ endif
 
 redir_if_ok = > "$@" || ( RV=$$?; rm -f "$@"; exit $$RV )
 
+GENMLFILES:=$(MLGFILES:.mlg=.ml) $(ML4FILES:.ml4=.ml)
+$(addsuffix .d,$(ALLSRCFILES)): $(GENMLFILES)
+
 $(addsuffix .d,$(MLIFILES)): %.mli.d: %.mli
 	$(SHOW)'CAMLDEP $<'
 	$(HIDE)$(CAMLDEP) $(OCAMLLIBS) "$<" $(redir_if_ok)
-- 
cgit v1.2.3