diff options
| author | Wojciech Meyer <wojciech.meyer@gmail.com> | 2013-11-10 12:32:12 +0000 |
|---|---|---|
| committer | Wojciech Meyer <wojciech.meyer@gmail.com> | 2013-11-10 12:32:12 +0000 |
| commit | 928503e9b8364c416e089adca8101b0680ee06d6 (patch) | |
| tree | 862cc65aa22cc0c66d7ddbaf46e0fd331fc344e0 /tools/Makefile.shared | |
| parent | 7ea8f59082ce168d0d8efdad97cc4858d3765e1c (diff) | |
| download | ocaml-928503e9b8364c416e089adca8101b0680ee06d6.tar.gz | |
build: always build lex/ and ocamlc with the compiler from boot/.
(Patch by Adrien Nader!)
This is a partial revert of revision 14168 which caused issues when
bootstrapping the compiler. Since these directories don't take long to
build, we can always use a byte-compiled compiler.
Bootstrapping and more generally working on the compiler itself does not
play nice with trying to use the most recent compiler as soon as
possible: imagine you've just modified the compiler but in a way that
breaks it at runtime in a non-obvious way; all the files that are
subsequently built will have been built with your the compiler you will
be debugging.
v2: always build tools/ with boot/ocamlc since most executables link
against compiler libs.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14277 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'tools/Makefile.shared')
| -rw-r--r-- | tools/Makefile.shared | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/Makefile.shared b/tools/Makefile.shared index 76ed3c67e1..28ecac8288 100644 --- a/tools/Makefile.shared +++ b/tools/Makefile.shared @@ -12,8 +12,8 @@ include ../config/Makefile -CAMLC=$(CAMLC_BIN) -nostdlib -I ../boot -strict-sequence -CAMLOPT=$(CAMLOPT_BIN) -nostdlib -I ../stdlib +CAMLC=../boot/ocamlrun ../boot/ocamlc -strict-sequence -nostdlib -I ../boot +CAMLOPT=../boot/ocamlrun ../ocamlopt -nostdlib -I ../stdlib CAMLLEX=$(CAMLRUN) ../boot/ocamllex INCLUDES=-I ../utils -I ../parsing -I ../typing -I ../bytecomp -I ../asmcomp \ -I ../driver -I ../toplevel |