diff options
Diffstat (limited to 'js/src/shell/moz.build')
| -rw-r--r-- | js/src/shell/moz.build | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/js/src/shell/moz.build b/js/src/shell/moz.build index 4f04be73c..93812da74 100644 --- a/js/src/shell/moz.build +++ b/js/src/shell/moz.build @@ -3,13 +3,15 @@ # 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']: USE_LIBS += ['editline'] USE_LIBS += ['static:js'] -UNIFIED_SOURCES += [ +SOURCES += [ 'js.cpp', 'jsoptparse.cpp', 'jsshell.cpp', @@ -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 |