diff options
| author |  Jim Fehrle <jfehrle@sbcglobal.net> | 2018-06-28 13:04:27 -0700 |
|---|---|---|
| committer | Jim Fehrle <jfehrle@sbcglobal.net> | 2018-06-30 10:21:21 -0700 |
| commit | 069d17f4f138fd779eff589119a7783784ababd9 (patch) | |
| tree | 0a7fb0841703b7273f4609f3a0744e452239b78b | |
| parent | 74640d2b8bc158b301c0646db19747a86313e25a (diff) | |
Rebuild coqtop$(EXE) in "make coqbinaries" in addition to coqtop.opt$(EXE).
Fixes #7758.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.build | 4 | ||||
| -rw-r--r-- | Makefile.common | 4 | ||||
| -rw-r--r-- | Makefile.install | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -211,7 +211,7 @@ archclean: clean-ide optclean voclean rm -f $(ALLSTDLIB).* optclean: - rm -f $(COQTOPEXE) $(CHICKEN) $(TOPBIN) + rm -f $(COQTOPEXE) $(CHICKEN) $(TOPBINOPT) rm -f $(TOOLS) $(PRIVATEBINARIES) $(CSDPCERT) find . -name '*.cmx' -o -name '*.cmx[as]' -o -name '*.[soa]' -o -name '*.so' | xargs rm -f diff --git a/Makefile.build b/Makefile.build index ed251af77..60682c6e3 100644 --- a/Makefile.build +++ b/Makefile.build @@ -387,12 +387,12 @@ grammar/%.cmi: grammar/%.mli .PHONY: coqbinaries coqbyte -coqbinaries: $(TOPBIN) $(CHICKEN) $(CSDPCERT) $(FAKEIDE) +coqbinaries: $(TOPBINOPT) $(COQTOPEXE) $(CHICKEN) $(CSDPCERT) $(FAKEIDE) coqbyte: $(TOPBYTE) $(CHICKENBYTE) # Special rule for coqtop, we imitate `ocamlopt` can delete the target # to avoid #7666 -$(COQTOPEXE): $(TOPBIN:.opt=.$(BEST)) +$(COQTOPEXE): $(TOPBINOPT:.opt=.$(BEST)) rm -f $@ && cp $< $@ bin/%.opt$(EXE): topbin/%_bin.ml $(LINKCMX) $(LIBCOQRUN) diff --git a/Makefile.common b/Makefile.common index 5b1def40a..1506bfcad 100644 --- a/Makefile.common +++ b/Makefile.common @@ -14,8 +14,8 @@ # Executables ########################################################################### -TOPBIN:=$(addsuffix .opt$(EXE), $(addprefix bin/, coqtop coqproofworker coqtacticworker coqqueryworker)) -TOPBYTE:=$(TOPBIN:.opt$(EXE)=.byte$(EXE)) +TOPBINOPT:=$(addsuffix .opt$(EXE), $(addprefix bin/, coqtop coqproofworker coqtacticworker coqqueryworker)) +TOPBYTE:=$(TOPBINOPT:.opt$(EXE)=.byte$(EXE)) COQTOPEXE:=bin/coqtop$(EXE) COQTOPBYTE:=bin/coqtop.byte$(EXE) diff --git a/Makefile.install b/Makefile.install index 010e35d42..21015d336 100644 --- a/Makefile.install +++ b/Makefile.install @@ -70,7 +70,7 @@ endif install-binaries: install-tools $(MKDIR) $(FULLBINDIR) - $(INSTALLBIN) $(COQC) $(CHICKEN) $(COQTOPEXE) $(TOPBIN) $(FULLBINDIR) + $(INSTALLBIN) $(COQC) $(CHICKEN) $(COQTOPEXE) $(TOPBINOPT) $(FULLBINDIR) install-byte: install-coqide-byte $(MKDIR) $(FULLBINDIR) |