diff options
| author | Gaëtan Gilbert | 2020-01-03 11:07:03 +0100 |
|---|---|---|
| committer | Gaëtan Gilbert | 2020-01-03 16:08:21 +0100 |
| commit | 9bd9e70ca1953bd721f88f74e45cd36376eb2e4b (patch) | |
| tree | 8c0987005437e229e8a64a25fe56a15cf80707f1 | |
| parent | 524d0be2e3dd70090dbd9f98a065390610e96ef5 (diff) | |
coq_makefile: don't use CAMLPKGS when building cmxa of mllib
It seems broken according to unicoq experiences https://gitter.im/coq/coq?at=5e0e3e0005298604982ac3f7
Building cmxa of mlpack is already this way.
| -rw-r--r-- | doc/changelog/08-tools/11357-master.rst | 4 | ||||
| -rw-r--r-- | tools/CoqMakefile.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/changelog/08-tools/11357-master.rst b/doc/changelog/08-tools/11357-master.rst new file mode 100644 index 0000000000..599db5b1da --- /dev/null +++ b/doc/changelog/08-tools/11357-master.rst @@ -0,0 +1,4 @@ +- **Fixed:** + ``coq_makefile`` does not break when using the ``CAMLPKGS`` variable + together with an unpacked (``mllib``) plugin. (`#11357 + <https://github.com/coq/coq/pull/11357>`_, by Gaëtan Gilbert). diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in index 7c53ecfe18..7cd5962d86 100644 --- a/tools/CoqMakefile.in +++ b/tools/CoqMakefile.in @@ -632,7 +632,7 @@ $(MLLIBFILES:.mllib=.cma): %.cma: | %.mllib $(MLLIBFILES:.mllib=.cmxa): %.cmxa: | %.mllib $(SHOW)'CAMLOPT -a -o $@' - $(HIDE)$(CAMLOPTLINK) $(CAMLDEBUG) $(CAMLFLAGS) $(CAMLPKGS) -a -o $@ $^ + $(HIDE)$(CAMLOPTLINK) $(CAMLDEBUG) $(CAMLFLAGS) -a -o $@ $^ $(MLPACKFILES:.mlpack=.cmxs): %.cmxs: %.cmxa |