Backed out changeset 3ebab9ec3685 (bug 1653182) as requested by cpeterson for being a duplicate patch. CLOSED TREE

modules/libmar/sign/moz.build

@@ -28,9 +28,3 @@ c11_flags = ['-std=gnu11']
 if CONFIG['CC_TYPE'] == 'clang-cl':
     c11_flags.insert(0, '-Xclang')
 CFLAGS += c11_flags
-
-# 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

@@ -22,12 +22,6 @@ if CONFIG['CC_TYPE'] == 'clang-cl':
     c11_flags.insert(0, '-Xclang')
 HOST_CFLAGS += c11_flags
 
-# 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',
 ]
@@ -39,8 +33,6 @@ if CONFIG['MOZ_BUILD_APP'] != 'tools/update-packaging':
 
     CFLAGS += c11_flags
 
-    CFLAGS += c11_flags
-
     FORCE_STATIC_LIB = True
 
     if CONFIG['OS_ARCH'] == 'WINNT':

modules/libmar/tool/moz.build

@@ -26,12 +26,6 @@ if CONFIG['CC_TYPE'] == 'clang-cl':
     c11_flags.insert(0, '-Xclang')
 HOST_CFLAGS += c11_flags
 
-# 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':
@@ -41,8 +35,6 @@ if CONFIG['MOZ_BUILD_APP'] != 'tools/update-packaging':
 
     CFLAGS += c11_flags
 
-    CFLAGS += c11_flags
-
     USE_LIBS += [
         'mar',
         'nspr',

modules/libmar/verify/moz.build

@@ -47,9 +47,3 @@ c11_flags = ['-std=gnu11']
 if CONFIG['CC_TYPE'] == 'clang-cl':
     c11_flags.insert(0, '-Xclang')
 CFLAGS += c11_flags
-
-# C11 for static_assert
-c11_flags = ['-std=gnu11']
-if CONFIG['CC_TYPE'] == 'clang-cl':
-    c11_flags.insert(0, '-Xclang')
-CFLAGS += c11_flags