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