From 9bd9e70ca1953bd721f88f74e45cd36376eb2e4b Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Fri, 3 Jan 2020 11:07:03 +0100
Subject: 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.
---
 doc/changelog/08-tools/11357-master.rst | 4 ++++
 tools/CoqMakefile.in                    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 doc/changelog/08-tools/11357-master.rst

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
-- 
cgit v1.2.3