diff options
| -rwxr-xr-x | src/configure.sh | 2 | ||||
| -rw-r--r-- | src/versions/standard/Makefile.local | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/configure.sh b/src/configure.sh index fb265e0..57a4161 100755 --- a/src/configure.sh +++ b/src/configure.sh @@ -39,4 +39,6 @@ else cp ${pre}versions/standard/Structures_standard.v ${pre}versions/standard/Structures.v cp ${pre}versions/standard/Tactics_standard.v ${pre}Tactics.v coq_makefile -f _CoqProject -o Makefile + # work around https://github.com/coq/coq/issues/12603 + sed -i 's/^CAMLDONTLINK=unix,str$/CAMLDONTLINK=num,str,unix,dynlink,threads/' Makefile fi diff --git a/src/versions/standard/Makefile.local b/src/versions/standard/Makefile.local index 8abc72c..c57842a 100644 --- a/src/versions/standard/Makefile.local +++ b/src/versions/standard/Makefile.local @@ -25,6 +25,10 @@ clean:: CAMLLEX = $(CAMLBIN)ocamllex CAMLYACC = $(CAMLBIN)ocamlyacc +CAMLPKGS += -package num + +merlin-hook:: + $(HIDE)echo 'PKG num' >> .merlin %.ml : %.mll $(CAMLLEX) $< |