diff options
| author | Sébastien Hinderer <Sebastien.Hinderer@inria.fr> | 2017-01-15 17:20:20 +0100 |
|---|---|---|
| committer | Sébastien Hinderer <Sebastien.Hinderer@inria.fr> | 2017-02-15 11:18:10 +0100 |
| commit | 44097e323a8ac7f824ac1357eb8396b963523bd4 (patch) | |
| tree | d12111d8e42ec977ea10675ac1b45ecc00dbc11f | |
| parent | 2bd60155ef637bc2ad3e8c11ebac6a225a3cc551 (diff) | |
| download | ocaml-44097e323a8ac7f824ac1357eb8396b963523bd4.tar.gz | |
Deduplicate the bootstrap rule
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | Makefile.nt | 10 | ||||
| -rw-r--r-- | Makefile.shared | 8 |
3 files changed, 8 insertions, 19 deletions
@@ -41,14 +41,6 @@ reconfigure: # make clean runtime coreall # make coreboot [new system -- now in a stable state] -# Bootstrap and rebuild the whole system. -# The compilation of ocaml will fail if the runtime has changed. -# Never mind, just do make bootstrap to reach fixpoint again. -bootstrap: - $(MAKE) coreboot - $(MAKE) all - $(MAKE) compare - # Compile the native-code compiler opt-core: $(MAKE) runtimeopt @@ -98,7 +90,6 @@ natruntop: $(MAKE) ocamlnat @rlwrap --help 2>/dev/null && rlwrap $(NATRUNTOP) || $(NATRUNTOP) -.PHONY: bootstrap .PHONY: opt-core opt opt.opt .PHONY: world world.opt diff --git a/Makefile.nt b/Makefile.nt index 54e5f67b66..9bea89290d 100644 --- a/Makefile.nt +++ b/Makefile.nt @@ -17,18 +17,9 @@ include Makefile.shared -# The compilation of ocaml will fail if the runtime has changed. -# Never mind, just do make bootstrap to reach fixpoint again. - # Compile everything the first time world: coldstart all -# Do a complete bootstrapping cycle -bootstrap: - $(MAKEREC) coreboot - $(MAKEREC) all - $(MAKEREC) compare - # Compile the native-code compiler opt-core: $(MAKEREC) runtimeopt @@ -60,7 +51,6 @@ natruntop: $(MAKEREC) ocamlnat @rlwrap --help 2>/dev/null && $(EXTRAPATH) rlwrap $(NATRUNTOP) || $(EXTRAPATH) $(NATRUNTOP) -.PHONY: bootstrap .PHONY: opt-core opt opt.opt .PHONY: world world.opt diff --git a/Makefile.shared b/Makefile.shared index 2a0066f93f..105ae88969 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -441,6 +441,14 @@ all: runtime $(MAKE) ocaml $(MAKE) otherlibraries $(WITH_DEBUGGER) $(WITH_OCAMLDOC) +# Bootstrap and rebuild the whole system. +# The compilation of ocaml will fail if the runtime has changed. +# Never mind, just do make bootstrap to reach fixpoint again. +.PHONY: bootstrap +bootstrap: coreboot + $(MAKE) all + $(MAKE) compare + # FlexDLL sources missing error messages # Different git mechanism displayed depending on whether this source tree came # from a git clone or a source tarball. |