Issue mcp-graveyard/UXP#1676 - Part 21: Use js-cxxflags.mozbuild in testing code and js shell

3 files changed, 6 insertions, 21 deletions

diff --git a/js/src/gdb/moz.build b/js/src/gdb/moz.build
index a2e9356242..01f6cb0b64 100644
--- a/js/src/gdb/moz.build
+++ b/js/src/gdb/moz.build
@@ -5,6 +5,8 @@
 
 GeckoProgram('gdb-tests', linkage=None)
 
+include('../js-cxxflags.mozbuild')
+
 UNIFIED_SOURCES += [
     'gdb-tests.cpp',
     'tests/test-asmjs.cpp',
@@ -40,13 +42,6 @@ if CONFIG['MOZ_ICU_DATA_ARCHIVE']:
 
 OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
 
-if CONFIG['GNU_CXX']:
-    CXXFLAGS += ['-Wno-shadow', '-fno-strict-aliasing']
-
-# This is intended as a temporary workaround to enable VS2015.
-if CONFIG['_MSC_VER']:
-    CXXFLAGS += ['-wd4312']
-
 DEFINES['topsrcdir'] = '%s/js/src' % TOPSRCDIR
 FINAL_TARGET_PP_FILES += ['gdb-tests-gdb.py.in']
 OBJDIR_FILES.js.src.gdb += ['!/dist/bin/gdb-tests-gdb.py']
diff --git a/js/src/jsapi-tests/moz.build b/js/src/jsapi-tests/moz.build
index 378b2ed7fa..35bc69b85b 100644
--- a/js/src/jsapi-tests/moz.build
+++ b/js/src/jsapi-tests/moz.build
@@ -3,6 +3,8 @@
 # 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/.
 
+include(../js-cxxflags.mozbuild)
+
 GeckoProgram('jsapi-tests', linkage=None)
 
 UNIFIED_SOURCES += [
@@ -142,12 +144,5 @@ USE_LIBS += [
 
 OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
 
-if CONFIG['GNU_CXX']:
-    CXXFLAGS += ['-Wno-shadow', '-Werror=format', '-fno-strict-aliasing']
-
-# This is intended as a temporary workaround to enable VS2015.
-if CONFIG['_MSC_VER']:
-    CXXFLAGS += ['-wd4312']
-
 DEFINES['topsrcdir'] = '%s/js/src' % TOPSRCDIR
 OBJDIR_PP_FILES.js.src['jsapi-tests'] += ['jsapi-tests-gdb.py.in']
diff --git a/js/src/shell/moz.build b/js/src/shell/moz.build
index 7c861fb0d6..93812da74a 100644
--- a/js/src/shell/moz.build
+++ b/js/src/shell/moz.build
@@ -3,6 +3,8 @@
 # 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/.
 
+include('../js-cxxflags.mozbuild')
+
 if CONFIG['JS_SHELL_NAME']:
     GeckoProgram(CONFIG['JS_SHELL_NAME'], linkage=None)
     if CONFIG['JS_BUNDLED_EDITLINE']:
@@ -49,13 +51,6 @@ shellmoduleloader.inputs = [
     'ModuleLoader.js',
 ]
 
-if CONFIG['GNU_CXX']:
-    CXXFLAGS += ['-Wno-shadow', '-Werror=format']
-
-# This is intended as a temporary workaround to enable VS2015.
-if CONFIG['_MSC_VER']:
-    CXXFLAGS += ['-wd4312']
-
 # Place a GDB Python auto-load file next to the shell executable, both in
 # the build directory and in the dist/bin directory.
 DEFINES['topsrcdir'] = '%s/js/src' % TOPSRCDIR