diff options
| author | Wojciech Meyer <wojciech.meyer@gmail.com> | 2013-09-20 00:22:38 +0000 |
|---|---|---|
| committer | Wojciech Meyer <wojciech.meyer@gmail.com> | 2013-09-20 00:22:38 +0000 |
| commit | 241585bc8320dc6f41e9a885d5bda93a759111c0 (patch) | |
| tree | 98aec028105162c5ca887bde4d78676038a6f853 /ocamldoc | |
| parent | 8104198af76eca5d1314947fff8ae5f4a6a320a9 (diff) | |
| download | ocaml-241585bc8320dc6f41e9a885d5bda93a759111c0.tar.gz | |
build: replace ocamlcomp*.sh.
This script was built from ocamlcomp.sh.in through sed and is called
instead of "ocamlc" (for instance).
It makes it possible to switch from "ocamlc" to "ocamlc.opt" without
changing anything in the Makefiles, only calling sed.
I couldn't cleanly make it handle both a compiler for the target and for
the build. Instead I'm replacing it and doing as much as possible
directly in the Makefiles.
I hoped it would reduce the number of shell invocations, which would
speed things up quite a lot on Windows but I still had to have at least
one since it's not possible to update a make variable from inside a make
rule: i.e. it's not possible to do X=a, build a.opt and update X to be
a.opt.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14168 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'ocamldoc')
| -rw-r--r-- | ocamldoc/Makefile | 5 | ||||
| -rw-r--r-- | ocamldoc/Makefile.nt | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile index bf4b32d9ab..ffc387184e 100644 --- a/ocamldoc/Makefile +++ b/ocamldoc/Makefile @@ -14,9 +14,8 @@ include ../config/Makefile # Various commands and dir ########################## -CAMLRUN=../boot/ocamlrun -OCAMLC = ../ocamlcomp.sh -OCAMLOPT = ../ocamlcompopt.sh +OCAMLC = $(CAMLC_BIN) -nostdlib -I ../stdlib +OCAMLOPT = $(CAMLOPT_BIN) -nostdlib -I ../stdlib OCAMLDEP = $(CAMLRUN) ../tools/ocamldep OCAMLLEX = $(CAMLRUN) ../boot/ocamllex OCAMLYACC= ../boot/ocamlyacc diff --git a/ocamldoc/Makefile.nt b/ocamldoc/Makefile.nt index 6343d9810a..ee155e7931 100644 --- a/ocamldoc/Makefile.nt +++ b/ocamldoc/Makefile.nt @@ -14,9 +14,8 @@ include ../config/Makefile # Various commands and dir ########################## -CAMLRUN=../boot/ocamlrun -OCAMLC = ../ocamlcomp.sh -OCAMLOPT = ../ocamlcompopt.sh +OCAMLC = $(CAMLC_BIN) -nostdlib -I ../stdlib +OCAMLOPT = $(CAMLOPT_BIN) -nostdlib -I ../stdlib OCAMLDEP = $(CAMLRUN) ../tools/ocamldep OCAMLLEX = $(CAMLRUN) ../boot/ocamllex OCAMLYACC= ../boot/ocamlyacc |