# HG changeset patch
# User andrew
# Date 1345649962 -3600
# Node ID f552beb8b4b33346d35a47f56fa46f3a4e9062b9
# Parent  7ef99df651efdd205ba93ad465674aecfcf36eda
PR1095: Allow -Werror to be turned off.

diff -r 7ef99df651ef -r f552beb8b4b3 make/com/sun/nio/sctp/Makefile
--- a/make/com/sun/nio/sctp/Makefile	Tue Aug 14 17:11:11 2012 -0400
+++ b/make/com/sun/nio/sctp/Makefile	Wed Aug 22 16:39:22 2012 +0100
@@ -60,7 +60,9 @@
   -I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders
 
 ifeq ($(PLATFORM), linux)
+ifneq ($(COMPILER_WARNINGS_FATAL),false)
 COMPILER_WARNINGS_FATAL=true
+endif
 #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
 OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
 endif
diff -r 7ef99df651ef -r f552beb8b4b3 make/java/nio/Makefile
--- a/make/java/nio/Makefile	Tue Aug 14 17:11:11 2012 -0400
+++ b/make/java/nio/Makefile	Wed Aug 22 16:39:22 2012 +0100
@@ -31,7 +31,7 @@
 PACKAGE = java.nio
 LIBRARY = nio
 PRODUCT = java
-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
+OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial
 include $(BUILDDIR)/common/Defs.gmk
 
 NIO_SRC = $(SHARE_SRC)/classes/java/nio
diff -r 7ef99df651ef -r f552beb8b4b3 make/java/sun_nio/Makefile
--- a/make/java/sun_nio/Makefile	Tue Aug 14 17:11:11 2012 -0400
+++ b/make/java/sun_nio/Makefile	Wed Aug 22 16:39:22 2012 +0100
@@ -31,7 +31,7 @@
 PACKAGE = sun.nio
 PRODUCT = sun
 
-OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -Werror
+OTHER_JAVACFLAGS += -Xlint:serial,-deprecation
 include $(BUILDDIR)/common/Defs.gmk
 
 #
diff -r 7ef99df651ef -r f552beb8b4b3 make/sun/native2ascii/Makefile
--- a/make/sun/native2ascii/Makefile	Tue Aug 14 17:11:11 2012 -0400
+++ b/make/sun/native2ascii/Makefile	Wed Aug 22 16:39:22 2012 +0100
@@ -30,7 +30,7 @@
 BUILDDIR = ../..
 PACKAGE = sun.tools.native2ascii
 PRODUCT = sun
-OTHER_JAVACFLAGS += -Xlint:serial -Werror
+OTHER_JAVACFLAGS += -Xlint:serial
 include $(BUILDDIR)/common/Defs.gmk
 
 # This program must contain a manifest that defines the execution level
diff -r 7ef99df651ef -r f552beb8b4b3 make/sun/nio/cs/Makefile
--- a/make/sun/nio/cs/Makefile	Tue Aug 14 17:11:11 2012 -0400
+++ b/make/sun/nio/cs/Makefile	Wed Aug 22 16:39:22 2012 +0100
@@ -36,7 +36,7 @@
 # This re-directs all the class files to a separate location
 CLASSDESTDIR = $(TEMPDIR)/classes
 
-OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -Werror
+OTHER_JAVACFLAGS += -Xlint:serial,-deprecation
 include $(BUILDDIR)/common/Defs.gmk
 
 #
diff -r 7ef99df651ef -r f552beb8b4b3 make/tools/Makefile
--- a/make/tools/Makefile	Tue Aug 14 17:11:11 2012 -0400
+++ b/make/tools/Makefile	Wed Aug 22 16:39:22 2012 +0100
@@ -29,7 +29,14 @@
 
 BUILDDIR = ..
 
-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true JAVAC_WARNINGS_FATAL=true
+ifndef JAVAC_MAX_WARNINGS
+  SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
+endif
+
+ifndef JAVAC_WARNINGS_FATAL
+  SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
+endif
+
 include $(BUILDDIR)/common/Defs.gmk
 
 # Note: freetypecheck is built by Sanity.gmk if needed