Bug 1932297 - Stop forcing C99 or C11 for some C libraries. r=firefox-build-system-reviewers,sergesanspaille

These CFLAGS overrides aren't necessary now that we default to C17. These libraries all compile correctly as C17.

Depends on D229576

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

build/clang-plugin/tests/moz.build

@@ -94,8 +94,6 @@ COMPILE_FLAGS["OS_CFLAGS"] = [
     "-Xclang",
     "-verify",
     "-ferror-limit=0",
-    "-Xclang",
-    "-std=c11",
     "-Wno-invalid-noreturn",
 ]
 

media/ffvpx/libavcodec/moz.build

@@ -140,11 +140,6 @@ LOCAL_INCLUDES += [
     '/media/libvorbis',
 ]
 
-c11_flags = ["-std=gnu11"]
-if CONFIG["CC_TYPE"] == "clang-cl":
-    c11_flags.insert(0, "-Xclang")
-CFLAGS += c11_flags
-
 if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
   LOCAL_INCLUDES += ['/media/libvpx']
 else:

media/ffvpx/libavutil/moz.build

@@ -78,11 +78,6 @@ EXPORTS.ffvpx = [
     "tx.h"
 ]
 
-c11_flags = ["-std=gnu11"]
-if CONFIG["CC_TYPE"] == "clang-cl":
-    c11_flags.insert(0, "-Xclang")
-CFLAGS += c11_flags
-
 SYMBOLS_FILE =  'avutil.symbols'
 NoVisibilityFlags()
 

modules/freetype2/moz.build

@@ -6,8 +6,6 @@
 
 DEFINES['FT2_BUILD_LIBRARY'] = True
 
-CFLAGS += ['-std=c99']
-
 LOCAL_INCLUDES += [
     'include',
 ]

modules/libmar/sign/moz.build

@@ -22,9 +22,3 @@ DEFINES["MAR_NSS"] = True
 
 if CONFIG["OS_ARCH"] == "WINNT":
     USE_STATIC_LIBS = True
-
-# C11 for static_assert
-c11_flags = ["-std=gnu11"]
-if CONFIG["CC_TYPE"] == "clang-cl":
-    c11_flags.insert(0, "-Xclang")
-CFLAGS += c11_flags

modules/libmar/src/moz.build

@@ -16,12 +16,6 @@ HOST_SOURCES += [
 ]
 HostLibrary("hostmar")
 
-# C11 for static_assert
-c11_flags = ["-std=gnu11"]
-if CONFIG["CC_TYPE"] == "clang-cl":
-    c11_flags.insert(0, "-Xclang")
-HOST_CFLAGS += c11_flags
-
 LOCAL_INCLUDES += [
     "../../../other-licenses/nsis/Contrib/CityHash/cityhash",
 ]
@@ -31,8 +25,6 @@ if CONFIG["MOZ_BUILD_APP"] != "tools/update-packaging":
 
     UNIFIED_SOURCES += HOST_SOURCES
 
-    CFLAGS += c11_flags
-
     FORCE_STATIC_LIB = True
 
     if CONFIG["OS_ARCH"] == "WINNT":

modules/libmar/tool/moz.build

@@ -20,12 +20,6 @@ if CONFIG["HOST_OS_ARCH"] == "WINNT":
         "ws2_32",
     ]
 
-# C11 for static_assert
-c11_flags = ["-std=gnu11"]
-if CONFIG["CC_TYPE"] == "clang-cl":
-    c11_flags.insert(0, "-Xclang")
-HOST_CFLAGS += c11_flags
-
 HOST_DEFINES["NO_SIGN_VERIFY"] = True
 
 if CONFIG["MOZ_BUILD_APP"] != "tools/update-packaging":
@@ -33,8 +27,6 @@ if CONFIG["MOZ_BUILD_APP"] != "tools/update-packaging":
 
     SOURCES += HOST_SOURCES
 
-    CFLAGS += c11_flags
-
     USE_LIBS += [
         "mar",
         "nspr",

modules/libmar/verify/moz.build

@@ -44,9 +44,3 @@ LOCAL_INCLUDES += [
 if CONFIG["MOZ_USE_NSS_FOR_MAR"]:
     LOCAL_INCLUDES += ["../sign"]
     DEFINES["MAR_NSS"] = True
-
-# C11 for static_assert
-c11_flags = ["-std=gnu11"]
-if CONFIG["CC_TYPE"] == "clang-cl":
-    c11_flags.insert(0, "-Xclang")
-CFLAGS += c11_flags

toolkit/crashreporter/google-breakpad/src/common/mac/moz.build

@@ -22,6 +22,4 @@ SOURCES += [
 
 Library('breakpad_mac_common_s')
 
-CMFLAGS += ['-std=c99']
-
 include('/toolkit/crashreporter/crashreporter.mozbuild')