aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile.build
diff options
context:
space:
mode:
authorGravatar Maxime Dénès <mail@maximedenes.fr>2016-01-05 19:36:02 +0100
committerGravatar Maxime Dénès <mail@maximedenes.fr>2016-01-05 19:36:02 +0100
commit8a9445fbf65d4ddf2c96348025d487b4d54a5d01 (patch)
treeb76decc6370803cf156429204f3c3c7944d9750c /Makefile.build
parente4a682e2f2c91fac47f55cd8619af2321b2e4c30 (diff)
Fix order of files in mllib.
CString was linked after Serialize, although the later was using CString.equal. This had not been noticed so far because OCaml was ignoring functions marked as external in interfaces (which is the case of CString.equal) when considering link dependencies. This was changed on the OCaml side as part of the fix of PR#6956, so linking was now failing in several places.
Diffstat (limited to 'Makefile.build')
-rw-r--r--Makefile.build5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.build b/Makefile.build
index 00ff6a7a4..56fc5f0c7 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -294,9 +294,10 @@ checker/check.cmxa: | md5chk checker/check.mllib.d
# Csdp to micromega special targets
###########################################################################
-plugins/micromega/csdpcert$(EXE): $(CSDPCERTCMO:.cmo=$(BESTOBJ))
+plugins/micromega/csdpcert$(EXE): $(CSDPCERTCMO:.cmo=$(BESTOBJ)) \
+ $(addsuffix $(BESTLIB), lib/clib)
$(SHOW)'OCAMLBEST -o $@'
- $(HIDE)$(call bestocaml,,nums unix)
+ $(HIDE)$(call bestocaml,,nums unix clib)
###########################################################################
# CoqIde special targets