error on warnings by default

Dane Springmeyer · Dane Springmeyer · commit e71462d40b98 · 2017-03-16T18:13:27.000-07:00
diff --git a/Makefile b/Makefile
@@ -1,5 +1,8 @@
 MODULE_NAME := $(shell node -e "console.log(require('./package.json').binary.module_name)")
 
+# Whether to turn compiler warnings into errors
+export WERROR ?= true
+
 default: release
 
 node_modules:
@@ -8,11 +11,11 @@ node_modules:
 	npm install --ignore-scripts
 
 release: node_modules
-	V=1 ./node_modules/.bin/node-pre-gyp configure build --loglevel=error
+	V=1 ./node_modules/.bin/node-pre-gyp configure build --error_on_warnings=$(WERROR) --loglevel=error
 	@echo "run 'make clean' for full rebuild"
 
 debug: node_modules
-	V=1 ./node_modules/.bin/node-pre-gyp configure build --loglevel=error --debug
+	V=1 ./node_modules/.bin/node-pre-gyp configure build --error_on_warnings=$(WERROR) --loglevel=error --debug
 	@echo "run 'make clean' for full rebuild"
 
 coverage:
diff --git a/binding.gyp b/binding.gyp
@@ -1,5 +1,8 @@
 {
   'includes': [ 'common.gypi' ],
+  'variables': {
+      'error_on_warnings%':'true'
+  },
   'targets': [
     {
       'target_name': '<(module_name)',
@@ -11,6 +14,14 @@
       'ldflags': [
         '-Wl,-z,now',
       ],
+      'conditions': [
+        ['error_on_warnings != "false"', {
+            'cflags_cc' : [ '-Werror' ],
+            'xcode_settings': {
+              'OTHER_CPLUSPLUSFLAGS': [ '-Werror' ]
+            }
+        }]
+      ],
       'xcode_settings': {
         'OTHER_LDFLAGS':[
           '-Wl,-bind_at_load'
