From 69e5a25a51fddadc4e38a8a717170eadde519018 Mon Sep 17 00:00:00 2001
From: trav90 <travawine@protonmail.ch>
Date: Fri, 6 Apr 2018 14:37:18 -0500
Subject: [PATCH] Only add -Wno-null-conversion when building with clang

Fixes some GCC warning spam.
---
 toolkit/components/protobuf/moz.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/protobuf/moz.build b/toolkit/components/protobuf/moz.build
index b5015eb678..8cca3514c5 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