From c551aa18b87d3ed47378783c3472e23407d32098 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Tue, 28 Aug 2018 09:22:39 -0400
Subject: [PATCH] Bug 1486020 - eliminate warning spam about ICU RTTI with
 MSVC; r=chmanchester

---
 config/external/icu/defs.mozbuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/external/icu/defs.mozbuild b/config/external/icu/defs.mozbuild
index 99a6d57b8efd..66e6c4267586 100644
--- a/config/external/icu/defs.mozbuild
+++ b/config/external/icu/defs.mozbuild
@@ -30,7 +30,10 @@ if CONFIG['MOZ_DEBUG']:
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     CXXFLAGS += ['-frtti']
 elif CONFIG['OS_TARGET'] == 'WINNT':
-    CXXFLAGS += ['-GR']
+    # Remove the -GR- flag so we don't get a bunch of warning spam.
+    COMPILE_FLAGS['OS_CXXFLAGS'] = [
+        f for f in COMPILE_FLAGS['OS_CXXFLAGS'] if f != '-GR-'
+    ] + ['-GR']
 
 DisableStlWrapping()
 AllowCompilerWarnings()