/hg/release/icedtea7-forest-2.4/langtools: Change -Werror fix to...

[andrew at icedtea.classpath.org]

changeset 1b9aeaa2344b in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=1b9aeaa2344b
author: martin
date: Wed Apr 17 13:46:11 2013 +0100

	Change -Werror fix to preserve OpenJDK default.


diffstat:

 make/Makefile         |  6 ++----
 make/build.properties |  3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 43a160f96f49 -r 1b9aeaa2344b make/Makefile
--- a/make/Makefile	Thu Feb 14 02:27:26 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)
diff -r 43a160f96f49 -r 1b9aeaa2344b make/build.properties
--- a/make/build.properties	Thu Feb 14 02:27:26 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/