mirror of
https://github.com/openjdk/jdk.git
synced 2026-02-01 05:58:29 +00:00
6854244: change source/target used to compile JDK to 7
Reviewed-by: ohair
This commit is contained in:
parent
19093784f4
commit
50dfd0ebd9
@ -92,9 +92,9 @@ ABS_TEMP_DIR = $(ABS_OUTPUTDIR)/tmp
|
||||
dummy := $(shell $(MKDIR) -p $(TEMP_DIR))
|
||||
|
||||
# The language version we want for this jdk build
|
||||
SOURCE_LANGUAGE_VERSION=5
|
||||
SOURCE_LANGUAGE_VERSION=7
|
||||
# The class version we want for this jdk build
|
||||
TARGET_CLASS_VERSION=5
|
||||
TARGET_CLASS_VERSION=7
|
||||
|
||||
# The MESSAGE, WARNING and ERROR files are used to store sanity check and
|
||||
# source check messages, warnings and errors.
|
||||
|
||||
@ -122,13 +122,13 @@ ifeq ($(JAVAC_WARNINGS_FATAL), true)
|
||||
JAVACFLAGS += -Werror
|
||||
endif
|
||||
|
||||
# Add the source level (currently all source is 1.5, should this be 1.6?)
|
||||
SOURCE_LANGUAGE_VERSION = 5
|
||||
# Add the source level
|
||||
SOURCE_LANGUAGE_VERSION = 7
|
||||
LANGUAGE_VERSION = -source $(SOURCE_LANGUAGE_VERSION)
|
||||
JAVACFLAGS += $(LANGUAGE_VERSION)
|
||||
|
||||
# Add the class version we want (currently this is 5, should it be 6 or even 7?)
|
||||
TARGET_CLASS_VERSION = 5
|
||||
# Add the class version we want
|
||||
TARGET_CLASS_VERSION = 7
|
||||
CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
|
||||
JAVACFLAGS += $(CLASS_VERSION)
|
||||
JAVACFLAGS += -encoding ascii
|
||||
|
||||
@ -33,8 +33,8 @@ AUTO_FILES_JAVA_DIRS = java/dyn sun/dyn
|
||||
|
||||
# The sources built here use new language syntax to generate
|
||||
# method handle calls. Let's be sure we are using that format.
|
||||
#LANGUAGE_VERSION = -source 7
|
||||
#CLASS_VERSION = -target 7
|
||||
LANGUAGE_VERSION = -source 7
|
||||
CLASS_VERSION = -target 7
|
||||
|
||||
# Actually, it will be less disruptive to compile with the same
|
||||
# -target option as the rest of the system, and just turn on
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user