aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Letouzey2016-06-14 18:16:27 +0200
committerPierre Letouzey2016-06-14 18:16:36 +0200
commit4a5b6f10b55597e0a0d27ec34fa4f914cfcbc6e8 (patch)
tree6711e817cb35061e7871f91637804668d7b346e8
parenta1eeb3abe387a89cd5a9108160643b6157f9c0af (diff)
Repair the build of ide/coqidetop.cmxs (fix #4812)
Restore the .cmxa-->.cmxs rule from the Makefile. Sorry, I was thinking that all plugins would now be built from .mlpack (hence using only the .cmx-->.cmxs rule), and I forgot about this coqidetop business. Now the really intersting question is : why on earth 'make world' was silently failing to build this file but succeeding nonetheless ?!
-rw-r--r--Makefile.build8
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.build b/Makefile.build
index 4eafe1d619..fef1a3f707 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -567,6 +567,14 @@ plugins/%.cmx: plugins/%.ml
$(SHOW)'OCAMLOPT -shared -o $@'
$(HIDE)$(OCAMLOPT) -shared -o $@ $<
+%.cmxs: %.cmxa
+ $(SHOW)'OCAMLOPT -shared -o $@'
+ifeq ($(HASNATDYNLINK),os5fixme)
+ $(HIDE)dev/ocamlopt_shared_os5fix.sh "$(OCAMLOPT)" $@
+else
+ $(HIDE)$(OCAMLOPT) -linkall -shared -o $@ $<
+endif
+
%.ml: %.mll
$(SHOW)'OCAMLLEX $<'
$(HIDE)$(OCAMLLEX) -o $@ "$*.mll"