--- a/hotspot/make/bsd/makefiles/gcc.make	Mon Feb 08 18:54:09 2016 +0300
+++ b/hotspot/make/bsd/makefiles/gcc.make	Thu Dec 17 16:12:58 2015 +0300
@@ -256,7 +256,7 @@
 
 # Compiler warnings are treated as errors
 ifneq ($(COMPILER_WARNINGS_FATAL),false)
-  WARNINGS_ARE_ERRORS = -Werror
+  WARNINGS_ARE_ERRORS ?= -Werror
 endif
 
 ifeq ($(USE_CLANG), true)