summaryrefslogtreecommitdiffstats
path: root/toolkit/components
diff options
context:
space:
mode:
authortrav90 <travawine@protonmail.ch>2018-04-06 14:37:18 -0500
committertrav90 <travawine@protonmail.ch>2018-04-06 14:37:18 -0500
commit1b846d4b523821d743cee212943cec078e7280cd (patch)
tree149e3ffdb8cc6526056eff8209eccf873b0b75a2 /toolkit/components
parent0433d6e7d1b32183a2b7c35cef6e8f7072943e14 (diff)
downloadUXP-1b846d4b523821d743cee212943cec078e7280cd.tar
UXP-1b846d4b523821d743cee212943cec078e7280cd.tar.gz
UXP-1b846d4b523821d743cee212943cec078e7280cd.tar.lz
UXP-1b846d4b523821d743cee212943cec078e7280cd.tar.xz
UXP-1b846d4b523821d743cee212943cec078e7280cd.zip
Only add -Wno-null-conversion when building with clang
Fixes some GCC warning spam.
Diffstat (limited to 'toolkit/components')
-rw-r--r--toolkit/components/protobuf/moz.build5
1 files changed, 4 insertions, 1 deletions
diff --git a/toolkit/components/protobuf/moz.build b/toolkit/components/protobuf/moz.build
index b5015eb67..8cca3514c 100644
--- a/toolkit/components/protobuf/moz.build
+++ b/toolkit/components/protobuf/moz.build
@@ -117,10 +117,13 @@ DEFINES['GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER'] = True
# Suppress warnings in third-party code.
if CONFIG['GNU_CXX']:
CXXFLAGS += [
- '-Wno-null-conversion',
'-Wno-return-type',
'-Wno-sign-compare',
]
+ if CONFIG['CLANG_CXX']:
+ CXXFLAGS += [
+ '-Wno-null-conversion',
+ ]
elif CONFIG['_MSC_VER']:
CXXFLAGS += [
'-wd4005', # 'WIN32_LEAN_AND_MEAN' : macro redefinition