# HG changeset patch
# User Nathan Froyd <froydnj@mozilla.com>
# Date 1535462559 14400
#      Tue Aug 28 09:22:39 2018 -0400
# Node ID 793be675465bde66c019439cb1ec4dc4c4653607
# Parent  b09a2762f0e5533dab80401953121580134a2c6e
Bug 1486020 - eliminate warning spam about ICU RTTI with MSVC; r=chmanchester

diff --git a/config/external/icu/defs.mozbuild b/config/external/icu/defs.mozbuild
--- a/config/external/icu/defs.mozbuild
+++ b/config/external/icu/defs.mozbuild
@@ -25,17 +25,20 @@ if not CONFIG['HAVE_LANGINFO_CODESET']:
 
 if CONFIG['MOZ_DEBUG']:
     DEFINES['U_DEBUG'] = 1
 
 # ICU requires RTTI
 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()
 
 # We allow compiler warnings, but we can at least cut down on spammy
 # warnings that get triggered for every file.
 if CONFIG['CC_TYPE'] == 'clang-cl':
     CFLAGS += [