Mercurial > hg > truffle

comparison make/linux/makefiles/rules.make @ 971:0fc81f0a8ca8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
970:682194ca1d8d 971:0fc81f0a8ca8
120 120
121 endif 121 endif
122 endif 122 endif
123 endif 123 endif
124 124
125 COMPILE.JAVAC += $(BOOTSTRAP_JAVAC_FLAGS)
126
125 SUM = /usr/bin/sum 127 SUM = /usr/bin/sum
126 128
127 # 'gmake MAKE_VERBOSE=y' gives all the gory details. 129 # 'gmake MAKE_VERBOSE=y' gives all the gory details.
128 QUIETLY$(MAKE_VERBOSE) = @ 130 QUIETLY$(MAKE_VERBOSE) = @
129 RUN.JAR$(MAKE_VERBOSE) += >/dev/null 131 RUN.JAR$(MAKE_VERBOSE) += >/dev/null
132
133 # Settings for javac
134 BOOT_SOURCE_LANGUAGE_VERSION = 6
135 BOOT_TARGET_CLASS_VERSION = 6
136 JAVAC_FLAGS = -g -encoding ascii
137 BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
130 138
131 # With parallel makes, print a message at the end of compilation. 139 # With parallel makes, print a message at the end of compilation.
132 ifeq ($(findstring j,$(MFLAGS)),j) 140 ifeq ($(findstring j,$(MFLAGS)),j)
133 COMPILE_DONE = && { echo Done with $<; } 141 COMPILE_DONE = && { echo Done with $<; }
134 endif 142 endif