equal
deleted
inserted
replaced
124 # 'gmake MAKE_VERBOSE=y' gives all the gory details. |
124 # 'gmake MAKE_VERBOSE=y' gives all the gory details. |
125 QUIETLY$(MAKE_VERBOSE) = @ |
125 QUIETLY$(MAKE_VERBOSE) = @ |
126 RUN.JAR$(MAKE_VERBOSE) += >/dev/null |
126 RUN.JAR$(MAKE_VERBOSE) += >/dev/null |
127 |
127 |
128 # Settings for javac |
128 # Settings for javac |
129 BOOT_SOURCE_LANGUAGE_VERSION = 6 |
|
130 BOOT_TARGET_CLASS_VERSION = 6 |
|
131 JAVAC_FLAGS = -g -encoding ascii |
129 JAVAC_FLAGS = -g -encoding ascii |
132 BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) |
130 |
|
131 # Prefer BOOT_JDK_SOURCETARGET if it's set (typically by the top build system) |
|
132 # Fall back to the values here if it's not set (hotspot only builds) |
|
133 ifeq ($(BOOT_JDK_SOURCETARGET),) |
|
134 BOOTSTRAP_SOURCETARGET := -source 8 -target 8 |
|
135 else |
|
136 BOOTSTRAP_SOURCETARGET := $(BOOT_JDK_SOURCETARGET) |
|
137 endif |
|
138 |
|
139 BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) $(BOOTSTRAP_SOURCETARGET) |
133 |
140 |
134 # With parallel makes, print a message at the end of compilation. |
141 # With parallel makes, print a message at the end of compilation. |
135 ifeq ($(findstring j,$(MFLAGS)),j) |
142 ifeq ($(findstring j,$(MFLAGS)),j) |
136 COMPILE_DONE = && { echo Done with $<; } |
143 COMPILE_DONE = && { echo Done with $<; } |
137 endif |
144 endif |