File tree Expand file tree Collapse file tree 3 files changed +13
-2
lines changed Expand file tree Collapse file tree 3 files changed +13
-2
lines changed Original file line number Diff line number Diff line change 2727
2828 'clang%' : 0 ,
2929 'error_on_warn%' : 'false' ,
30+ 'suppress_all_error_on_warn%' : 'false' ,
3031
3132 'openssl_product' : '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)' ,
3233 'openssl_no_asm%' : 0 ,
Original file line number Diff line number Diff line change 149149 default = None ,
150150 help = 'Turn compiler warnings into errors for node core sources.' )
151151
152+ parser .add_argument ('--suppress-all-error-on-warn' ,
153+ action = 'store_true' ,
154+ dest = 'suppress_all_error_on_warn' ,
155+ default = False ,
156+ help = 'Suppress cases where compiler warnings are turned into errors by default.' )
157+
152158parser .add_argument ('--gdb' ,
153159 action = 'store_true' ,
154160 dest = 'gdb' ,
@@ -1397,7 +1403,10 @@ def configure_node(o):
13971403 o ['variables' ]['node_use_amaro' ] = b (not options .without_amaro )
13981404 o ['variables' ]['debug_node' ] = b (options .debug_node )
13991405 o ['default_configuration' ] = 'Debug' if options .debug else 'Release'
1406+ if options .error_on_warn and options .suppress_all_error_on_warn :
1407+ raise Exception ('--error_on_warn is incompatible with --suppress_all_error_on_warn.' )
14001408 o ['variables' ]['error_on_warn' ] = b (options .error_on_warn )
1409+ o ['variables' ]['suppress_all_error_on_warn' ] = b (options .suppress_all_error_on_warn )
14011410 o ['variables' ]['use_prefix_to_find_headers' ] = b (options .use_prefix_to_find_headers )
14021411
14031412 host_arch = host_arch_win () if os .name == 'nt' else host_arch_cc ()
Original file line number Diff line number Diff line change 871871 'openssl_default_cipher_list%' : '' ,
872872 },
873873
874- 'cflags' : ['-Werror=unused-result' ],
875-
876874 'defines' : [
877875 'NODE_ARCH="<(target_arch)"' ,
878876 'NODE_PLATFORM="<(OS)"' ,
893891 'NODE_OPENSSL_DEFAULT_CIPHER_LIST="<(openssl_default_cipher_list)"'
894892 ]
895893 }],
894+ [ 'suppress_all_error_on_warn=="false"' , {
895+ 'cflags' : ['-Werror=unused-result' ],
896+ }],
896897 [ 'error_on_warn=="true"' , {
897898 'cflags' : ['-Werror' ],
898899 'xcode_settings' : {
You can’t perform that action at this time.
0 commit comments