diff options
| author | Gabriel Scherer <gabriel.scherer@gmail.com> | 2014-04-07 09:44:51 +0000 |
|---|---|---|
| committer | Gabriel Scherer <gabriel.scherer@gmail.com> | 2014-04-07 09:44:51 +0000 |
| commit | 95e245666efcd4458bb46efde37bc85ce4c31f90 (patch) | |
| tree | 7547febdc3e9417a21a2b3d895fa23e46435a989 /Makefile.nt | |
| parent | 42da2a157fff58bc41e7cada917e86448cfe2e5f (diff) | |
| download | ocaml-95e245666efcd4458bb46efde37bc85ce4c31f90.tar.gz | |
CI golf: try a better fix for tools install in Makefile.nt
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14541 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'Makefile.nt')
| -rw-r--r-- | Makefile.nt | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.nt b/Makefile.nt index d07397b132..fa244fe06f 100644 --- a/Makefile.nt +++ b/Makefile.nt @@ -208,11 +208,11 @@ opt-core: opt: $(MAKE) -f Makefile.nt opt-core - $(MAKE) -f Makefile.nt otherlibrariesopt + $(MAKE) -f Makefile.nt otherlibrariesopt ocamltoolsopt # Native-code versions of the tools opt.opt: core opt-core ocamlc.opt all ocamlopt.opt ocamllex.opt \ - ocamltoolsopt.opt $(OCAMLBUILDNATIVE) $(OCAMLDOC_OPT) + ocamltoolsopt ocamltoolsopt.opt $(OCAMLBUILDNATIVE) $(OCAMLDOC_OPT) # Complete build using fast compilers world.opt: coldstart opt.opt @@ -274,8 +274,7 @@ installopt: else :; fi for i in $(OTHERLIBRARIES); do $(MAKEREC) -C otherlibs/$$i installopt; done if test -f ocamlopt.opt ; then $(MAKEREC) installoptopt; fi - # does not work yet, as "cd tools; $(MAKE) opt" has not been run previously - # cd tools; $(MAKE) installopt + cd tools; $(MAKE) installopt installoptopt: cp ocamlc.opt $(INSTALL_BINDIR)/ocamlc.opt$(EXE) @@ -620,8 +619,13 @@ clean:: ocamltools: ocamlc ocamlyacc ocamllex asmcomp/cmx_format.cmi asmcomp/printclambda.cmo cd tools ; $(MAKEREC) all + +ocamltoolsopt: + cd tool; $(MAKEREC) opt + ocamltoolsopt.opt: ocamlc.opt ocamlyacc ocamllex asmcomp/cmx_format.cmi asmcomp/printclambda.cmx cd tools ; $(MAKEREC) opt.opt + partialclean:: cd tools ; $(MAKEREC) clean alldepend:: @@ -718,8 +722,8 @@ distclean: .PHONY: coreboot defaultentry depend distclean install installopt .PHONY: library library-cross libraryopt ocamlbuild-mixed-boot .PHONY: ocamlbuild.byte ocamlbuild.native ocamldebugger ocamldoc -.PHONY: ocamldoc.opt ocamllex ocamllex.opt ocamltools ocamltools.opt -.PHONY: ocamlyacc opt-core opt opt.opt otherlibraries +.PHONY: ocamldoc.opt ocamllex ocamllex.opt ocamltools ocamltoolsopt +.PHONY: ocamltoolsopt.opt ocamlyacc opt-core opt opt.opt otherlibraries .PHONY: otherlibrariesopt promote promote-cross .PHONY: restore runtime runtimeopt makeruntimeopt world world.opt |