From 85c26d2c5768d87fcbc54e316a0e5534aede060d Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Tue, 18 Aug 2009 19:50:12 +0100 Subject: [PATCH] 6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk javac The bootstrap javac currently uses the default source and targets of the boot javac Reviewed-by: ohair --- jdk/make/common/shared/Defs-java.gmk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdk/make/common/shared/Defs-java.gmk b/jdk/make/common/shared/Defs-java.gmk index 9d918af877d..f9ed6353131 100644 --- a/jdk/make/common/shared/Defs-java.gmk +++ b/jdk/make/common/shared/Defs-java.gmk @@ -201,7 +201,10 @@ endif ifeq ($(JAVAC_WARNINGS_FATAL), true) BOOT_JAVACFLAGS += -Werror endif -BOOT_JAVACFLAGS += -encoding ascii + +BOOT_SOURCE_LANGUAGE_VERSION = 6 +BOOT_TARGET_CLASS_VERSION = 6 +BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) BOOT_JAR_JFLAGS += $(JAR_JFLAGS) BOOT_JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS)