Mercurial > hg > truffle
diff make/linux/makefiles/rules.make @ 971:0fc81f0a8ca8
6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk
Summary: The build fails if the bootstrap JDK defaults to <1.5
Reviewed-by: jcoomes
| author | andrew |
|---|---|
| date | Sat, 12 Sep 2009 12:50:07 +0100 |
| parents | 9c2ecc2ffb12 |
| children | c18cbe5936b8 |
line wrap: on
line diff
--- a/make/linux/makefiles/rules.make Thu Sep 10 09:04:41 2009 -0400 +++ b/make/linux/makefiles/rules.make Sat Sep 12 12:50:07 2009 +0100 @@ -122,12 +122,20 @@ endif endif +COMPILE.JAVAC += $(BOOTSTRAP_JAVAC_FLAGS) + SUM = /usr/bin/sum # 'gmake MAKE_VERBOSE=y' gives all the gory details. QUIETLY$(MAKE_VERBOSE) = @ RUN.JAR$(MAKE_VERBOSE) += >/dev/null +# Settings for javac +BOOT_SOURCE_LANGUAGE_VERSION = 6 +BOOT_TARGET_CLASS_VERSION = 6 +JAVAC_FLAGS = -g -encoding ascii +BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) + # With parallel makes, print a message at the end of compilation. ifeq ($(findstring j,$(MFLAGS)),j) COMPILE_DONE = && { echo Done with $<; }