Mercurial > hg > release > icedtea7-forest-2.3 > langtools
changeset 1368:fd956199cb82 icedtea-2.3.9
Change -Werror fix to preserve OpenJDK default.
| author | martin |
|---|---|
| date | Wed, 17 Apr 2013 13:46:11 +0100 |
| parents | 23907f495db8 |
| children | 0d9ff3ffd433 |
| files | make/Makefile make/build.properties |
| diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Makefile Fri Mar 08 16:05:31 2013 +0000 +++ b/make/Makefile Wed Apr 17 13:46:11 2013 +0100 @@ -111,10 +111,8 @@ ANT_OPTIONS += -Ddebug.classfiles=true endif -ifeq ($(JAVAC_WARNINGS_FATAL), true) - ANT_OPTIONS += -Dwarnings.fatal=-Werror -else - ANT_OPTIONS += -Dwarnings.fatal= +ifeq ($(JAVAC_WARNINGS_FATAL), false) + ANT_OPTIONS += -Djavac.warnings.fatal= endif # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
--- a/make/build.properties Fri Mar 08 16:05:31 2013 +0000 +++ b/make/build.properties Wed Apr 17 13:46:11 2013 +0100 @@ -68,7 +68,8 @@ # set the following to -version to verify the versions of javac being used javac.version.opt = # in time, there should be no exceptions to -Xlint:all -javac.lint.opts = -Xlint:all,-deprecation ${warnings.fatal} +javac.warnings.fatal = -Werror +javac.lint.opts = -Xlint:all,-deprecation ${javac.warnings.fatal} # options for the <javadoc> task for javac #javadoc.jls3.url=http://java.sun.com/docs/books/jls/