From 928503e9b8364c416e089adca8101b0680ee06d6 Mon Sep 17 00:00:00 2001 From: Wojciech Meyer Date: Sun, 10 Nov 2013 12:32:12 +0000 Subject: 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 --- tools/Makefile.shared | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/Makefile.shared') 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 -- cgit v1.2.1