Skip to content

Commit

Permalink
build: add --error-on-warn configure flag
Browse files Browse the repository at this point in the history
This commit adds a configuration time flag named error-on-warn:
$ ./configure --help | grep -A1 error-on-warn
  --error-on-warn       Turn compiler warnings into errors for node core
                        sources.

The motivation for this is that CI jobs can use this flag to turn
warnings into errors.

PR-URL: #32685
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Matheus Marchini <mat@mmarchini.me>
  • Loading branch information
danbev authored and targos committed May 7, 2020
1 parent 5ed8bbe commit 6a6d58b
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
10 changes: 9 additions & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
'uv_library%': 'static_library',

'clang%': 0,
'error_on_warn%': 'false',

'openssl_fips%': '',

Expand Down Expand Up @@ -252,7 +253,14 @@
# Forcibly disable -Werror. We support a wide range of compilers, it's
# simply not feasible to squelch all warnings, never mind that the
# libraries in deps/ are not under our control.
'cflags!': ['-Werror'],
'conditions': [
[ 'error_on_warn=="false"', {
'cflags!': ['-Werror'],
}, '(_target_name!="<(node_lib_target_name)" or '
'_target_name!="<(node_core_target_name)")', {
'cflags!': ['-Werror'],
}],
],
'msvs_settings': {
'VCCLCompilerTool': {
'BufferSecurityCheck': 'true',
Expand Down
6 changes: 6 additions & 0 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,11 @@
choices=valid_os,
help='operating system to build for ({0})'.format(', '.join(valid_os)))

parser.add_option('--error-on-warn',
action='store_true',
dest='error_on_warn',
help='Turn compiler warnings into errors for node core sources.')

parser.add_option('--gdb',
action='store_true',
dest='gdb',
Expand Down Expand Up @@ -1012,6 +1017,7 @@ def configure_node(o):
o['variables']['node_install_npm'] = b(not options.without_npm)
o['variables']['debug_node'] = b(options.debug_node)
o['default_configuration'] = 'Debug' if options.debug else 'Release'
o['variables']['error_on_warn'] = b(options.error_on_warn)

host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc()
target_arch = options.dest_cpu or host_arch
Expand Down
6 changes: 6 additions & 0 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,9 @@
'msvs_disabled_warnings!': [4244],

'conditions': [
[ 'error_on_warn=="true"', {
'cflags': ['-Werror'],
}],
[ 'node_intermediate_lib_type=="static_library" and '
'node_shared=="true" and OS=="aix"', {
# For AIX, shared lib is linked by static lib and .exp. In the
Expand Down Expand Up @@ -749,6 +752,9 @@
'msvs_disabled_warnings!': [4244],

'conditions': [
[ 'error_on_warn=="true"', {
'cflags': ['-Werror'],
}],
[ 'node_builtin_modules_path!=""', {
'defines': [ 'NODE_BUILTIN_MODULES_PATH="<(node_builtin_modules_path)"' ]
}],
Expand Down

0 comments on commit 6a6d58b

Please sign in to comment.