make plugin loadable via findlib

LPCIC · Nov 26, 2021 · a63bdc0 · a63bdc0
1 parent 4909286
commit a63bdc0
Showing 2 changed files with 13 additions and 0 deletions.
diff --git 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
@@ -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)