From 17605fb84aeb05c1a0d07d300815d2f98418480a Mon Sep 17 00:00:00 2001
From: Raphael Rieu-Helft <raphael.rieu-helft@lri.fr>
Date: Thu, 22 Mar 2018 16:52:04 +0100
Subject: [PATCH] Makefile and .merlin fixes

The compiler-libs Ident interface conflicts with Why3's Ident module, so adding compiler-libs to the .merlin does more harm than good.
---
 .merlin.in  | 2 +-
 Makefile.in | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.merlin.in b/.merlin.in
index 7e54b4f2b..e64b6d9c3 100644
--- a/.merlin.in
+++ b/.merlin.in
@@ -43,4 +43,4 @@ B plugins/tptp
 B plugins/python
 B lib/why3
 
-PKG str unix num dynlink @COMPILERLIBSPKG@ @ZIPLIB@ @LABLGTK2PKG@ @META_OCAMLGRAPH@
+PKG str unix num dynlink @ZIPLIB@ @LABLGTK2PKG@ @META_OCAMLGRAPH@
diff --git a/Makefile.in b/Makefile.in
index 0bdc482b9..2d1c948ec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -284,10 +284,10 @@ src/util/strings.cmx: WARNINGS:=$(WARNINGS)-3
 # compiler plugins
 
 ifeq (@enable_compiler_plugins@,yes)
-src/utils/debug_optim.cmxs:
+src/util/debug_optim.cmxs: src/util/debug_optim.ml
 	$(SHOW) 'Linking $@'
-	$(HIDE)$(OCAMLOPT) -I @COMPILERLIBS@ -shared src/util/debug_optim.ml -o src/util/debug_optim.cmxs
-src/transform/reification.cmx: src/utils/debug_optim.cmxs
+	$(HIDE)$(OCAMLOPT) -I @COMPILERLIBS@ -shared src/util/debug_optim.ml -o $@
+src/transform/reification.cmx: src/util/debug_optim.cmxs
 src/transform/reification.cmx: OFLAGS += -plugin debug_optim.cmxs
 endif
 
-- 
GitLab