Commit 14236ef
build: add build option suppress_all_error_on_warn
Add an option to suppress cases where warnings are on by
default
Signed-off-by: Michael Dawson <midawson@redhat.com>
PR-URL: #56647
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>1 parent 60039a2 commit 14236ef
3 files changed
Lines changed: 13 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -27,6 +27,7 @@ | |||
| 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 | |
|---|---|---|---|
@@ -149,6 +149,12 @@ | |||
| 149 | 149 | default=None, | |
| 150 | 150 | help='Turn compiler warnings into errors for node core sources.') | |
| 151 | 151 | ||
| 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 | + | ||
| 152 | 158 | parser.add_argument('--gdb', | |
| 153 | 159 | action='store_true', | |
| 154 | 160 | dest='gdb', | |
@@ -1397,7 +1403,10 @@ def configure_node(o): | |||
| 1397 | 1403 | o['variables']['node_use_amaro'] = b(not options.without_amaro) | |
| 1398 | 1404 | o['variables']['debug_node'] = b(options.debug_node) | |
| 1399 | 1405 | 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.') | ||
| 1400 | 1408 | 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) | ||
| 1401 | 1410 | o['variables']['use_prefix_to_find_headers'] = b(options.use_prefix_to_find_headers) | |
| 1402 | 1411 | ||
| 1403 | 1412 | host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc() | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -871,8 +871,6 @@ | |||
| 871 | 871 | 'openssl_default_cipher_list%': '', | |
| 872 | 872 | }, | |
| 873 | 873 | ||
| 874 | - 'cflags': ['-Werror=unused-result'], | ||
| 875 | - | ||
| 876 | 874 | 'defines': [ | |
| 877 | 875 | 'NODE_ARCH="<(target_arch)"', | |
| 878 | 876 | 'NODE_PLATFORM="<(OS)"', | |
@@ -893,6 +891,9 @@ | |||
| 893 | 891 | 'NODE_OPENSSL_DEFAULT_CIPHER_LIST="<(openssl_default_cipher_list)"' | |
| 894 | 892 | ] | |
| 895 | 893 | }], | |
| 894 | + [ 'suppress_all_error_on_warn=="false"', { | ||
| 895 | + 'cflags': ['-Werror=unused-result'], | ||
| 896 | + }], | ||
| 896 | 897 | [ 'error_on_warn=="true"', { | |
| 897 | 898 | 'cflags': ['-Werror'], | |
| 898 | 899 | 'xcode_settings': { | |
0 commit comments