Bug 1292463 - Move --enable-warnings-as-errors to python configure. r…

…=chmanchester

b2g/common.configure

@@ -25,5 +25,7 @@ def package_moztt(value):
 
 set_define('PACKAGE_MOZTT', package_moztt)
 
+imply_option('MOZ_ENABLE_WARNINGS_AS_ERRORS',
+             depends(target)(lambda t: t.os == 'Android'), reason='--target')
 
 include('../toolkit/moz.configure')

b2g/confvars.sh

@@ -52,10 +52,6 @@ MOZ_PAY=1
 MOZ_TOOLKIT_SEARCH=
 MOZ_B2G=1
 
-if test "$OS_TARGET" = "Android"; then
-MOZ_ENABLE_WARNINGS_AS_ERRORS=1
-fi
-
 MOZ_JSDOWNLOADS=1
 
 MOZ_BUNDLED_FONTS=1

b2g/graphene/confvars.sh

@@ -47,10 +47,6 @@ MOZ_TOOLKIT_SEARCH=
 MOZ_PLACES=
 MOZ_B2G=1
 
-if test "$OS_TARGET" = "Android"; then
-MOZ_ENABLE_WARNINGS_AS_ERRORS=1
-fi
-
 MOZ_JSDOWNLOADS=1
 
 MOZ_BUNDLED_FONTS=1

build/moz.configure/old.configure

@@ -256,7 +256,6 @@ def old_configure_options(*options):
     '--enable-url-classifier',
     '--enable-valgrind',
     '--enable-verify-mar',
-    '--enable-warnings-as-errors',
     '--enable-webapp-runtime',
     '--enable-webrtc',
     '--enable-websms-backend',

build/moz.configure/warnings.configure

@@ -0,0 +1,12 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+js_option('--enable-warnings-as-errors', env='MOZ_ENABLE_WARNINGS_AS_ERRORS',
+          help='Enable treating warnings as errors')
+
+add_old_configure_assignment(
+    'MOZ_ENABLE_WARNINGS_AS_ERRORS',
+    depends('--enable-warnings-as-errors')(lambda x: bool(x)))

js/src/old-configure.in

@@ -512,15 +512,6 @@ fi
 
 MOZ_CONFIG_SANITIZE
 
-dnl ========================================================
-dnl = Enable treating compiler warnings as errors
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(warnings-as-errors,
-[  --enable-warnings-as-errors
-                          Enable treating warnings as errors],
-    MOZ_ENABLE_WARNINGS_AS_ERRORS=1,
-    MOZ_ENABLE_WARNINGS_AS_ERRORS=)
-
 dnl ========================================================
 dnl GNU specific defaults
 dnl ========================================================

moz.configure

@@ -99,6 +99,8 @@ include_when('build/moz.configure/memory.configure',
              when='--enable-compile-environment')
 include_when('build/moz.configure/headers.configure',
              when='--enable-compile-environment')
+include_when('build/moz.configure/warnings.configure',
+             when='--enable-compile-environment')
 
 @depends('--help')
 @imports(_from='mozbuild.backend', _import='backends')

old-configure.in

@@ -676,15 +676,6 @@ if test -n "$COMPILE_ENVIRONMENT"; then
    MOZ_CONFIG_SANITIZE
 fi
 
-dnl ========================================================
-dnl = Enable treating compiler warnings as errors
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(warnings-as-errors,
-[  --enable-warnings-as-errors
-                          Enable treating warnings as errors],
-    MOZ_ENABLE_WARNINGS_AS_ERRORS=1,
-    MOZ_ENABLE_WARNINGS_AS_ERRORS=)
-
 dnl ========================================================
 dnl GNU specific defaults
 dnl ========================================================