summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-04-07 18:16:54 +0200
committerGitHub <noreply@github.com>2018-04-07 18:16:54 +0200
commit09b78833b5c2d615f5e485029deb256f2cb3638d (patch)
tree5088c5f4c544336a6f60c8d5c36251283a609dfa /toolkit
parent03cf69df453c7d4e188259e4bfb7317e8e993a33 (diff)
parent1b846d4b523821d743cee212943cec078e7280cd (diff)
downloadUXP-09b78833b5c2d615f5e485029deb256f2cb3638d.tar
UXP-09b78833b5c2d615f5e485029deb256f2cb3638d.tar.gz
UXP-09b78833b5c2d615f5e485029deb256f2cb3638d.tar.lz
UXP-09b78833b5c2d615f5e485029deb256f2cb3638d.tar.xz
UXP-09b78833b5c2d615f5e485029deb256f2cb3638d.zip
Merge pull request #93 from trav90/buildsystem-work
Fix a few GCC build warnings
Diffstat (limited to 'toolkit')
-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