File tree 3 files changed +13
-2
lines changed
3 files changed +13
-2
lines changed Original file line number Diff line number Diff line change 27
27
28
28
'clang%' : 0 ,
29
29
'error_on_warn%' : 'false' ,
30
+ 'suppress_all_error_on_warn%' : 'false' ,
30
31
31
32
'openssl_product' : '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)' ,
32
33
'openssl_no_asm%' : 0 ,
Original file line number Diff line number Diff line change 148
148
default = None ,
149
149
help = 'Turn compiler warnings into errors for node core sources.' )
150
150
151
+ parser .add_argument ('--suppress-all-error-on-warn' ,
152
+ action = 'store_true' ,
153
+ dest = 'suppress_all_error_on_warn' ,
154
+ default = False ,
155
+ help = 'Suppress cases where compiler warnings are turned into errors by default.' )
156
+
151
157
parser .add_argument ('--gdb' ,
152
158
action = 'store_true' ,
153
159
dest = 'gdb' ,
@@ -1395,7 +1401,10 @@ def configure_node(o):
1395
1401
o ['variables' ]['node_use_amaro' ] = b (not options .without_amaro )
1396
1402
o ['variables' ]['debug_node' ] = b (options .debug_node )
1397
1403
o ['default_configuration' ] = 'Debug' if options .debug else 'Release'
1404
+ if options .error_on_warn and options .suppress_all_error_on_warn :
1405
+ raise Exception ('--error_on_warn is incompatible with --suppress_all_error_on_warn.' )
1398
1406
o ['variables' ]['error_on_warn' ] = b (options .error_on_warn )
1407
+ o ['variables' ]['suppress_all_error_on_warn' ] = b (options .suppress_all_error_on_warn )
1399
1408
o ['variables' ]['use_prefix_to_find_headers' ] = b (options .use_prefix_to_find_headers )
1400
1409
1401
1410
host_arch = host_arch_win () if os .name == 'nt' else host_arch_cc ()
Original file line number Diff line number Diff line change 880
880
'openssl_default_cipher_list%' : '' ,
881
881
},
882
882
883
- 'cflags' : ['-Werror=unused-result' ],
884
-
885
883
'defines' : [
886
884
'NODE_ARCH="<(target_arch)"' ,
887
885
'NODE_PLATFORM="<(OS)"' ,
902
900
'NODE_OPENSSL_DEFAULT_CIPHER_LIST="<(openssl_default_cipher_list)"'
903
901
]
904
902
}],
903
+ [ 'suppress_all_error_on_warn=="false"' , {
904
+ 'cflags' : ['-Werror=unused-result' ],
905
+ }],
905
906
[ 'error_on_warn=="true"' , {
906
907
'cflags' : ['-Werror' ],
907
908
'xcode_settings' : {
You can’t perform that action at this time.
0 commit comments