Bug 1319604 - Only add -Wno-null-conversion when building with clang. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 23 Nov 2016 09:14:37 +0900
changeset 323956 30297a41cdd1177f3ace2447642d82619af73aa5
parent 323955 e52d162e55a32d6f9a905ab1eb4831f0bb98593f
child 323957 4010d412d8c52888861355a9de57fb933fd6d9a3
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersgps
bugs1319604
milestone53.0a1
Bug 1319604 - Only add -Wno-null-conversion when building with clang. r=gps
toolkit/components/protobuf/moz.build
--- a/toolkit/components/protobuf/moz.build
+++ b/toolkit/components/protobuf/moz.build
@@ -112,20 +112,23 @@ ALLOW_COMPILER_WARNINGS = True
 FINAL_LIBRARY = 'xul'
 
 DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
 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
         '-wd4018', # '<' : signed/unsigned mismatch
         '-wd4099', # mismatched class/struct tags
     ]
 
 if CONFIG['MOZ_USE_PTHREADS']: