Commit 46969672 authored by POTTIER Francois's avatar POTTIER Francois
Browse files

Temporarily remove the call to [make merlin], because it fails.

(Recent versions of Dune do not generate src/.merlin any more.)
Waiting for a better patch.
parent 90b800b7
......@@ -38,9 +38,7 @@ TARGETS := src fuzz benchmark
.PHONY: all
all:
@ dune build $(PROFILE) $(TARGETS) ; make merlin
# Regardless of whether compilation succeeds or fails,
# invoke [make merlin] to patch src/.merlin.
@ dune build $(PROFILE) $(TARGETS)
# [make setup] installs the packages that we need in whatever opam
# switch is currently active.
......@@ -52,6 +50,7 @@ setup:
.PHONY: merlin
merlin:
@ touch src/.merlin
# Add a preprocessing directive at the end of the FLG line.
@ sed -i.bak '/^FLG/ s/$$/ -pp "cppo -D dev"/' src/.merlin
@ rm -f src/.merlin.bak
......
Supports Markdown
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