Bug 1216318 - Updates to -Werror configuration, r=kaieNSS_3_21_Beta3

2 files changed, 78 insertions, 40 deletions

diff --git a/coreconf/Darwin.mk b/coreconf/Darwin.mk
index 269f6e1af..85af903ef 100644
--- a/coreconf/Darwin.mk
+++ b/coreconf/Darwin.mk
@@ -83,24 +83,41 @@ endif
 
 OS_CFLAGS	= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK $(DARWIN_SDK_CFLAGS)
 
-ifeq (clang,$(shell $(CC) -? 2>&1 >/dev/null | sed -e 's/:.*//;1q'))
-NSS_HAS_GCC48 = true
+# This tests to see if enabling the warning is possible before
+# setting an option to disable it.
+disable_warning=$(shell $(CC) -x c -E -Werror -W$(1) /dev/null >/dev/null 2>&1 && echo -Wno-$(1)) 
+
+COMPILER_NAME = $(shell $(CC) -? 2>&1 >/dev/null | sed -e 's/:.*//;1q')
+ifeq ($(COMPILER_NAME),clang)
+  # -Qunused-arguments : clang objects to arguments that it doesn't understand
+  #    and fixing this would require rearchitecture
+  OS_CFLAGS += -Qunused-arguments
+  # -Wno-parentheses-equality : because clang warns about macro expansions
+  OS_CFLAGS += $(call disable_warning,parentheses-equality)
 endif
-ifndef NSS_HAS_GCC48
-NSS_HAS_GCC48 := $(shell \
-  [ `$(CC) -dumpversion | cut -f 1 -d . -` -eq 4 -a \
-    `$(CC) -dumpversion | cut -f 2 -d . -` -ge 8 -o \
-    `$(CC) -dumpversion | cut -f 1 -d . -` -ge 5 ] && \
-  echo true || echo false)
-export NSS_HAS_GCC48
+
+ifndef NSS_ENABLE_WERROR
+  ifeq ($(COMPILER_NAME),clang)
+    NSS_ENABLE_WERROR = 1
+  else
+    NSS_ENABLE_WERROR := $(shell \
+    [ `$(CC) -dumpversion | cut -f 1 -d . -` -eq 4 -a \
+      `$(CC) -dumpversion | cut -f 2 -d . -` -ge 8 -o \
+      `$(CC) -dumpversion | cut -f 1 -d . -` -ge 5 ] && \
+      echo 1 || echo 0)
+    ifneq ($(NSS_ENABLE_WERROR),1)
+      $(warning Unable to find gcc >= 4.8 disabling -Werror)
+    endif
+  endif
+  export NSS_ENABLE_WERROR
 endif
-ifeq (true,$(NSS_HAS_GCC48))
-OS_CFLAGS += -Werror
+
+ifeq ($(NSS_ENABLE_WERROR),1)
+  OS_CFLAGS += -Werror
 else
-# Old versions of gcc (< 4.8) don't support #pragma diagnostic in functions.
-# Use this to disable use of that #pragma and the warnings it suppresses.
-OS_CFLAGS += -DNSS_NO_GCC48 -Wno-unused-variable -Wno-strict-aliasing
-$(warning Unable to find gcc >= 4.8 disabling -Werror)
+  # Old versions of gcc (< 4.8) don't support #pragma diagnostic in functions.
+  # Use this to disable use of that #pragma and the warnings it suppresses.
+  OS_CFLAGS += -DNSS_NO_GCC48
 endif
 
 ifdef BUILD_OPT
diff --git a/coreconf/Linux.mk b/coreconf/Linux.mk
index ad0cc1240..b3b5e408d 100644
--- a/coreconf/Linux.mk
+++ b/coreconf/Linux.mk
@@ -143,36 +143,57 @@ endif
 OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -pipe -ffunction-sections -fdata-sections -DLINUX -Dlinux -DHAVE_STRERROR
 OS_LIBS			= $(OS_PTHREAD) -ldl -lc
 
+# This tests to see if enabling the warning is possible before
+# setting an option to disable it.
+disable_warning=$(shell $(CC) -x c -E -Werror -W$(1) /dev/null >/dev/null 2>&1 && echo -Wno-$(1))
+
 ifeq ($(COMPILER_TAG),_clang)
-# -Qunused-arguments : clang objects to arguments that it doesn't understand
-#    and fixing this would require rearchitecture
-# -Wno-parentheses-equality : because clang warns about macro expansions
-OS_CFLAGS += -Qunused-arguments -Wno-parentheses-equality
-ifdef BUILD_OPT
-# clang is unable to handle glib's expansion of strcmp and similar for optimized
-# builds, so ignore the resulting errors.
-# See https://llvm.org/bugs/show_bug.cgi?id=20144
-OS_CFLAGS += -Wno-array-bounds -Wno-unevaluated-expression
-endif
-# Clang reports its version as an older gcc, but it's OK
-NSS_HAS_GCC48 = true
+  # -Qunused-arguments : clang objects to arguments that it doesn't understand
+  #    and fixing this would require rearchitecture
+  OS_CFLAGS += -Qunused-arguments
+  # -Wno-parentheses-equality : because clang warns about macro expansions
+  OS_CFLAGS += $(call disable_warning,parentheses-equality)
+  ifdef BUILD_OPT
+    # clang is unable to handle glib's expansion of strcmp and similar for optimized
+    # builds, so ignore the resulting errors.
+    # See https://llvm.org/bugs/show_bug.cgi?id=20144
+    OS_CFLAGS += $(call disable_warning,array-bounds)
+    OS_CFLAGS += $(call disable_warning,unevaluated-expression)
+  endif
 endif
 
-ifndef NSS_HAS_GCC48
-NSS_HAS_GCC48 := $(shell \
-  [ `$(CC) -dumpversion | cut -f 1 -d . -` -eq 4 -a \
-    `$(CC) -dumpversion | cut -f 2 -d . -` -ge 8 -o \
-    `$(CC) -dumpversion | cut -f 1 -d . -` -ge 5 ] && \
-  echo true || echo false)
-export NSS_HAS_GCC48
+ifndef NSS_ENABLE_WERROR
+  ifneq ($(OS_TARGET),Android)
+    # Android lollipop generates the following warning:
+    # error: call to 'sprintf' declared with attribute warning:
+    #   sprintf is often misused; please use snprintf [-Werror]
+    # So, just suppress -Werror entirely on Android
+    NSS_ENABLE_WERROR = 0
+    $(warning !!! OS_TARGET is Android, disabling -Werror)
+  else
+    ifeq ($(COMPILER_TAG),_clang)
+      # Clang reports its version as an older gcc, but it's OK
+      NSS_ENABLE_WERROR = 1
+    else
+      NSS_ENABLE_WERROR := $(shell \
+        [ `$(CC) -dumpversion | cut -f 1 -d . -` -eq 4 -a \
+          `$(CC) -dumpversion | cut -f 2 -d . -` -ge 8 -o \
+          `$(CC) -dumpversion | cut -f 1 -d . -` -ge 5 ] && \
+        echo 1 || echo 0)
+      ifneq ($(NSS_ENABLE_WERROR),1)
+        $(warning !!! Unable to find gcc 4.8 or greater, disabling -Werror)
+      endif
+    endif
+  endif
+  export NSS_ENABLE_WERROR
 endif
-ifeq (true,$(NSS_HAS_GCC48))
-OS_CFLAGS += -Werror
+
+ifeq (1,$(NSS_ENABLE_WERROR))
+  OS_CFLAGS += -Werror
 else
-# Old versions of gcc (< 4.8) don't support #pragma diagnostic in functions.
-# Use this to disable use of that #pragma and the warnings it suppresses.
-OS_CFLAGS += -DNSS_NO_GCC48
-$(warning Unable to find gcc >= 4.8 disabling -Werror)
+  # Old versions of gcc (< 4.8) don't support #pragma diagnostic in functions.
+  # Use this to disable use of that #pragma and the warnings it suppresses.
+  OS_CFLAGS += -DNSS_NO_GCC48
 endif
 
 ifdef USE_PTHREADS