Skip to content

Commit

Permalink
build: fix --error-on-warn for macOS
Browse files Browse the repository at this point in the history
XCode builds on macOS do not appear to inherit the `cflags` setting.

Signed-off-by: Richard Lau <[email protected]>

PR-URL: #33357
Refs: #32685
Reviewed-By: Michael Dawson <[email protected]>
Reviewed-By: Ruben Bridgewater <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Jiawen Geng <[email protected]>
  • Loading branch information
richardlau authored and codebytere committed May 16, 2020
1 parent f31b262 commit 7d4db35
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,9 @@
'conditions': [
[ 'error_on_warn=="true"', {
'cflags': ['-Werror'],
'xcode_settings': {
'WARNING_CFLAGS': [ '-Werror' ],
},
}],
[ 'node_intermediate_lib_type=="static_library" and '
'node_shared=="true" and OS=="aix"', {
Expand Down Expand Up @@ -757,6 +760,9 @@
'conditions': [
[ 'error_on_warn=="true"', {
'cflags': ['-Werror'],
'xcode_settings': {
'WARNING_CFLAGS': [ '-Werror' ],
},
}],
[ 'node_builtin_modules_path!=""', {
'defines': [ 'NODE_BUILTIN_MODULES_PATH="<(node_builtin_modules_path)"' ]
Expand Down

0 comments on commit 7d4db35

Please sign in to comment.