Commit 17605fb8 authored by Raphael Rieu-Helft's avatar Raphael Rieu-Helft

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.
parent 8c549418
...@@ -43,4 +43,4 @@ B plugins/tptp ...@@ -43,4 +43,4 @@ B plugins/tptp
B plugins/python B plugins/python
B lib/why3 B lib/why3
PKG str unix num dynlink @COMPILERLIBSPKG@ @ZIPLIB@ @LABLGTK2PKG@ @META_OCAMLGRAPH@ PKG str unix num dynlink @ZIPLIB@ @LABLGTK2PKG@ @META_OCAMLGRAPH@
...@@ -284,10 +284,10 @@ src/util/strings.cmx: WARNINGS:=$(WARNINGS)-3 ...@@ -284,10 +284,10 @@ src/util/strings.cmx: WARNINGS:=$(WARNINGS)-3
# compiler plugins # compiler plugins
ifeq (@enable_compiler_plugins@,yes) ifeq (@enable_compiler_plugins@,yes)
src/utils/debug_optim.cmxs: src/util/debug_optim.cmxs: src/util/debug_optim.ml
$(SHOW) 'Linking $@' $(SHOW) 'Linking $@'
$(HIDE)$(OCAMLOPT) -I @COMPILERLIBS@ -shared src/util/debug_optim.ml -o src/util/debug_optim.cmxs $(HIDE)$(OCAMLOPT) -I @COMPILERLIBS@ -shared src/util/debug_optim.ml -o $@
src/transform/reification.cmx: src/utils/debug_optim.cmxs src/transform/reification.cmx: src/util/debug_optim.cmxs
src/transform/reification.cmx: OFLAGS += -plugin debug_optim.cmxs src/transform/reification.cmx: OFLAGS += -plugin debug_optim.cmxs
endif endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment