From a63bdc0a0830ae45c3ff7fad549a46b065c667f4 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Fri, 26 Nov 2021 11:56:04 +0100 Subject: [PATCH] make plugin loadable via findlib --- CHANGES.md | 6 ++++++ Makefile | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 078d294ac..d2cb90417 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,9 @@ +# v1.13.8 (November 2021) + +- Build: + - link `camlp5.gramlib` as part of `elpi.cmxs` so that the plugin can be + loaded via findlib. + # v1.13.7 (July 2021) - Compiler: diff --git a/Makefile b/Makefile index e9505f028..1c26be851 100644 --- a/Makefile +++ b/Makefile @@ -25,8 +25,15 @@ TIME=--time $(shell if type -P gtime >/dev/null 2>&1; then type -P gtime; else e STACK=32768 DUNE_OPTS= +CP5:=$(shell ocamlfind query camlp5) + build: dune build $(DUNE_OPTS) @all + # hack: link camlp5.gramlib in the plugin + ocamlfind opt -shared -linkall -o _build/install/default/lib/elpi/elpi.cmxs \ + $(CP5)/gramlib.cmxa \ + _build/install/default/lib/elpi/elpi.cmxa + install: dune install $(DUNE_OPTS)