summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-03-10 11:10:35 +0100
committerGitHub <noreply@github.com>2018-03-10 11:10:35 +0100
commit9e2ba2237f3ead25f6caa0c6838934058f795fa8 (patch)
tree5811fb7409a0d382df30042b88d1cca896bb3a3f /js
parent2e5f399735258263bc1b172b5312567d1256093c (diff)
parent28b120018135438eaff8307f3cdef921a697d47a (diff)
downloadUXP-9e2ba2237f3ead25f6caa0c6838934058f795fa8.tar
UXP-9e2ba2237f3ead25f6caa0c6838934058f795fa8.tar.gz
UXP-9e2ba2237f3ead25f6caa0c6838934058f795fa8.tar.lz
UXP-9e2ba2237f3ead25f6caa0c6838934058f795fa8.tar.xz
UXP-9e2ba2237f3ead25f6caa0c6838934058f795fa8.zip
Merge pull request #51 from trav90/buildsystem-work
Improve support for GCC 7.x
Diffstat (limited to 'js')
-rw-r--r--js/src/gdb/moz.build2
-rw-r--r--js/src/jsapi-tests/moz.build2
-rw-r--r--js/src/moz.build6
3 files changed, 6 insertions, 4 deletions
diff --git a/js/src/gdb/moz.build b/js/src/gdb/moz.build
index 07047fb74..681f9807c 100644
--- a/js/src/gdb/moz.build
+++ b/js/src/gdb/moz.build
@@ -42,7 +42,7 @@ if CONFIG['ENABLE_INTL_API'] and CONFIG['MOZ_ICU_DATA_ARCHIVE']:
OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
if CONFIG['GNU_CXX']:
- CXXFLAGS += ['-Wno-shadow']
+ CXXFLAGS += ['-Wno-shadow', '-fno-strict-aliasing']
# This is intended as a temporary workaround to enable VS2015.
if CONFIG['_MSC_VER']:
diff --git a/js/src/jsapi-tests/moz.build b/js/src/jsapi-tests/moz.build
index ab42ff384..f7a6080aa 100644
--- a/js/src/jsapi-tests/moz.build
+++ b/js/src/jsapi-tests/moz.build
@@ -147,7 +147,7 @@ USE_LIBS += [
OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
if CONFIG['GNU_CXX']:
- CXXFLAGS += ['-Wno-shadow', '-Werror=format']
+ CXXFLAGS += ['-Wno-shadow', '-Werror=format', '-fno-strict-aliasing']
# This is intended as a temporary workaround to enable VS2015.
if CONFIG['_MSC_VER']:
diff --git a/js/src/moz.build b/js/src/moz.build
index 1162cb70c..77acb10b9 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -785,8 +785,10 @@ if CONFIG['JS_HAS_CTYPES']:
DEFINES['FFI_BUILDING'] = True
if CONFIG['GNU_CXX']:
- CXXFLAGS += ['-Wno-shadow', '-Werror=format']
+ # Disable strict-aliasing for GCC, which is enabled by default
+ # starting with version 7.1, see Mozilla bug 1363009.
+ CXXFLAGS += ['-Wno-shadow', '-Werror=format', '-fno-strict-aliasing']
# Suppress warnings in third-party code.
-if CONFIG['CLANG_CXX']:
+if CONFIG['CLANG_CXX'] or CONFIG['GNU_CXX']:
SOURCES['jsdtoa.cpp'].flags += ['-Wno-implicit-fallthrough']