Bug 1795215 - Keep -Wno-* flags when disabling compiler warnings. r=firefox-build-system-reviewers,andi

Differential Revision: https://phabricator.services.mozilla.com/D159364

build/templates.mozbuild

@@ -60,10 +60,13 @@ def AllowCompilerWarnings():
 
 @template
 def DisableCompilerWarnings():
-    COMPILE_FLAGS['WARNINGS_CFLAGS'] = []
+    # Keep the -Wno-* flags to disable warnings that may be enabled through other means.
-    COMPILE_FLAGS['WARNINGS_CXXFLAGS'] = []
+    def filter(flags):
-    HOST_COMPILE_FLAGS['WARNINGS_CFLAGS'] = []
+        return [f for f in flags or [] if f.startswith('-Wno-')]
-    HOST_COMPILE_FLAGS['WARNINGS_CXXFLAGS'] = []
+    COMPILE_FLAGS['WARNINGS_CFLAGS'] = filter(CONFIG['WARNINGS_CFLAGS'])
+    COMPILE_FLAGS['WARNINGS_CXXFLAGS'] = filter(CONFIG['WARNINGS_CXXFLAGS'])
+    HOST_COMPILE_FLAGS['WARNINGS_CFLAGS'] = filter(CONFIG['WARNINGS_HOST_CFLAGS'])
+    HOST_COMPILE_FLAGS['WARNINGS_CXXFLAGS'] = filter(CONFIG['WARNINGS_HOST_CXXFLAGS'])
 
 @template
 def RustLibrary(name, features=None, output_category=None, is_gkrust=False):