From 5cba636c873a93367cd3f26fd0efc919e68ddc5a Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Tue, 29 Aug 2017 17:30:26 +0200
Subject: coq_makefile: fix .merlin generation (FLG -thread)

---
 tools/CoqMakefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in
index 19b1d8cbda..f4d1118d0f 100644
--- a/tools/CoqMakefile.in
+++ b/tools/CoqMakefile.in
@@ -749,7 +749,7 @@ printenv::
 # file you can extend the merlin-hook target in @LOCAL_FILE@
 .merlin:
 	$(SHOW)'FILL .merlin'
-	$(HIDE)echo 'FLG -rectypes' > .merlin
+	$(HIDE)echo 'FLG -rectypes -thread' > .merlin
 	$(HIDE)echo 'B $(COQLIB)' >> .merlin
 	$(HIDE)echo 'S $(COQLIB)' >> .merlin
 	$(HIDE)$(foreach d,$(COQ_SRC_SUBDIRS), \
-- 
cgit v1.2.3