Mercurial > hg > openjdk > icedtea > jdk7 > jdk

changeset 5493:f552beb8b4b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR1095: Allow -Werror to be turned off.
author andrew
date Wed, 22 Aug 2012 16:39:22 +0100
parents 7ef99df651ef
children 968de9a6cf66
files make/com/sun/nio/sctp/Makefile make/java/nio/Makefile make/java/sun_nio/Makefile make/sun/native2ascii/Makefile make/sun/nio/cs/Makefile make/tools/Makefile
diffstat 6 files changed, 14 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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
 
 #
--- 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
--- 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
 
 #
--- 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