From 3247093b10305585d6c25735f9c31029126df9fe Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Mon, 15 Feb 2016 15:39:31 -0700
Subject: [PATCH] disable -Werror by default (but still use it for continuous
 integration)

Since we can't predict what warnings future compilers will emit, and
most people just want to build Avian without some new warning tripping
it up, we now omit -Werror unless requested via the "use-werror=true"
option to make.  Note that we pass "use-werror=true" in test/ci.sh to
ensure Travis alerts us to new warnings as they appear.

BTW, sorry about the unrelated whitespace changes in this patch; I've
got Emacs set up to fix whitespace "problems" on save, and those are
what it found.
---
 makefile   | 14 +++++++++-----
 test/ci.sh |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/makefile b/makefile
index c785558e2a..24592fdc27 100755
--- a/makefile
+++ b/makefile
@@ -46,8 +46,8 @@ endif
 ifeq ($(bootimage),true)
 	options := $(options)-bootimage
 	ifeq ($(bootimage-test),true)
-    # this option indicates that we should AOT-compile the test
-    # classes as well as the class library
+		# this option indicates that we should AOT-compile the test
+		# classes as well as the class library
 		options := $(options)-test
 	endif
 endif
@@ -126,6 +126,10 @@ ifeq ($(bootimage-test),true)
 	bootimage-classpath = $(classpath-build):$(test-build)
 endif
 
+ifeq ($(use-werror),true)
+	werror = -Werror
+endif
+
 test-executable = $(shell pwd)/$(executable)
 boot-classpath = $(classpath-build)
 embed-prefix = /avian-embedded
@@ -464,7 +468,7 @@ endif
 # note that we suppress the non-virtual-dtor warning because we never
 # use the delete operator, which means we don't need virtual
 # destructors:
-warnings = -Wall -Wextra -Werror -Wunused-parameter -Winit-self \
+warnings = -Wall -Wextra $(werror) -Wunused-parameter -Winit-self \
 	-Wno-non-virtual-dtor
 
 target-cflags = -DTARGET_BYTES_PER_WORD=$(pointer-size)
@@ -492,7 +496,7 @@ converter-cflags = -D__STDC_CONSTANT_MACROS -std=c++0x -Iinclude/ -Isrc/ \
 	-fno-rtti -fno-exceptions \
 	-DAVIAN_TARGET_ARCH=AVIAN_ARCH_UNKNOWN \
 	-DAVIAN_TARGET_FORMAT=AVIAN_FORMAT_UNKNOWN \
-	-Wall -Wextra -Werror -Wunused-parameter -Winit-self -Wno-non-virtual-dtor
+	-Wall -Wextra $(werror) -Wunused-parameter -Winit-self -Wno-non-virtual-dtor
 
 cflags = $(build-cflags)
 
@@ -736,7 +740,7 @@ ifeq ($(kernel),darwin)
 		sdk-dir = $(platform-dir)/Developer/SDKs
 
 		mac-version := $(shell \
-			  if test -d $(sdk-dir)/MacOSX10.11.sdk; then echo 10.11; \
+				if test -d $(sdk-dir)/MacOSX10.11.sdk; then echo 10.11; \
 			elif test -d $(sdk-dir)/MacOSX10.10.sdk; then echo 10.10; \
 			elif test -d $(sdk-dir)/MacOSX10.9.sdk; then echo 10.9; \
 			elif test -d $(sdk-dir)/MacOSX10.8.sdk; then echo 10.8; \
diff --git a/test/ci.sh b/test/ci.sh
index c52ca7cf01..a82e95c3eb 100755
--- a/test/ci.sh
+++ b/test/ci.sh
@@ -4,7 +4,7 @@ set -eo pipefail
 
 root_dir=$(pwd)
 
-flags="${@}"
+flags="use-werror=true ${@}"
 
 is-mac() {
   if [[ $(uname -s) == "Darwin" || ${TRAVIS_OS_NAME} == "osx" ]]; then