diff options
| author | Maxime Dénès | 2016-07-04 07:28:48 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2016-07-04 07:29:46 +0200 |
| commit | 5832742143fbb3ecd72044d426bfafaa3d3ce47e (patch) | |
| tree | 30fb64ce2e9ada4c14234fd2db006a5c6096637e | |
| parent | b1a13bc7af4f4b8b5249712d0a982cc510a2cb85 (diff) | |
| parent | 1cc70be070e1df522b1539892958496a77710331 (diff) | |
Merge remote-tracking branch 'github/pr/228' into v8.5
Was PR#228: fix coqide double module linking (error on OCaml 4.03)
Fixes #4747: Problem building Coq 8.5pl1 with OCaml 4.03.0: Fatal warnings
triggered by CoqIDE
| -rw-r--r-- | Makefile.build | 2 | ||||
| -rw-r--r-- | Makefile.common | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.build b/Makefile.build index 0f85608f9a..b5c933a168 100644 --- a/Makefile.build +++ b/Makefile.build @@ -653,7 +653,7 @@ $(COQWORKMGR): $(addsuffix $(BESTOBJ), stm/coqworkmgrApi tools/coqworkmgr) \ # fake_ide : for debugging or test-suite purpose, a fake ide simulating # a connection to coqtop -ideslave -$(FAKEIDE): lib/clib$(BESTLIB) lib/xml_lexer$(BESTOBJ) lib/xml_parser$(BESTOBJ) lib/xml_printer$(BESTOBJ) lib/errors$(BESTOBJ) lib/spawn$(BESTOBJ) ide/document$(BESTOBJ) ide/xmlprotocol$(BESTOBJ) tools/fake_ide$(BESTOBJ) | $(IDETOPLOOPCMA:.cma=$(BESTDYN)) +$(FAKEIDE): lib/clib$(BESTLIB) lib/errors$(BESTOBJ) lib/spawn$(BESTOBJ) ide/document$(BESTOBJ) ide/xmlprotocol$(BESTOBJ) tools/fake_ide$(BESTOBJ) | $(IDETOPLOOPCMA:.cma=$(BESTDYN)) $(SHOW)'OCAMLBEST -o $@' $(HIDE)$(call bestocaml,-I ide,str unix threads) diff --git a/Makefile.common b/Makefile.common index 1a903539c2..0dfd5deb7e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -231,7 +231,7 @@ endif LINKCMO:=$(CORECMA) $(STATICPLUGINS) LINKCMX:=$(CORECMA:.cma=.cmxa) $(STATICPLUGINS:.cma=.cmxa) -IDEDEPS:=lib/clib.cma lib/xml_lexer.cmo lib/xml_parser.cmo lib/xml_printer.cmo lib/errors.cmo lib/spawn.cmo +IDEDEPS:=lib/clib.cma lib/errors.cmo lib/spawn.cmo IDECMA:=ide/ide.cma IDETOPLOOPCMA=ide/coqidetop.cma |