Skip to content

Commit

Permalink
build: remove node_report option in node.gyp
Browse files Browse the repository at this point in the history
PR-URL: #32242
Fixes: #26293
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
  • Loading branch information
cjihrig authored and MylesBorins committed Mar 19, 2020
1 parent 514b7c2 commit 36ab39f
Showing 1 changed file with 13 additions and 40 deletions.
53 changes: 13 additions & 40 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@
'type': 'executable',

'defines': [
'NODE_ARCH="<(target_arch)"',
'NODE_PLATFORM="<(OS)"',
'NODE_WANT_INTERNALS=1',
],

Expand Down Expand Up @@ -423,13 +425,6 @@
'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ],
},
}],
[ 'node_report=="true"', {
'defines': [
'NODE_REPORT',
'NODE_ARCH="<(target_arch)"',
'NODE_PLATFORM="<(OS)"',
],
}],
['OS=="win"', {
'libraries': [
'Dbghelp.lib',
Expand Down Expand Up @@ -595,6 +590,9 @@
'src/node_process_events.cc',
'src/node_process_methods.cc',
'src/node_process_object.cc',
'src/node_report.cc',
'src/node_report_module.cc',
'src/node_report_utils.cc',
'src/node_serdes.cc',
'src/node_sockaddr.cc',
'src/node_stat_watcher.cc',
Expand Down Expand Up @@ -684,6 +682,7 @@
'src/node_perf_common.h',
'src/node_platform.h',
'src/node_process.h',
'src/node_report.h',
'src/node_revert.h',
'src/node_root_certs.h',
'src/node_sockaddr.h',
Expand Down Expand Up @@ -780,6 +779,7 @@
'libraries': [
'Dbghelp',
'Psapi',
'Ws2_32',
],
}],
[ 'node_use_etw=="true"', {
Expand Down Expand Up @@ -864,23 +864,6 @@
'src/tls_wrap.h'
],
}],
[ 'node_report=="true"', {
'sources': [
'src/node_report.cc',
'src/node_report_module.cc',
'src/node_report_utils.cc',
],
'defines': [
'NODE_REPORT',
'NODE_ARCH="<(target_arch)"',
'NODE_PLATFORM="<(OS)"',
],
'conditions': [
['OS=="win"', {
'libraries': [ 'Ws2_32' ],
}],
],
}],
[ 'OS in "linux freebsd mac" and '
'target_arch=="x64" and '
'node_target_type=="executable"', {
Expand Down Expand Up @@ -1137,7 +1120,11 @@
'test/cctest',
],

'defines': [ 'NODE_WANT_INTERNALS=1' ],
'defines': [
'NODE_ARCH="<(target_arch)"',
'NODE_PLATFORM="<(OS)"',
'NODE_WANT_INTERNALS=1',
],

'sources': [
'src/node_snapshot_stub.cc',
Expand All @@ -1154,6 +1141,7 @@
'test/cctest/test_linked_binding.cc',
'test/cctest/test_per_process.cc',
'test/cctest/test_platform.cc',
'test/cctest/test_report_util.cc',
'test/cctest/test_sockaddr.cc',
'test/cctest/test_traced_value.cc',
'test/cctest/test_util.cc',
Expand Down Expand Up @@ -1191,21 +1179,6 @@
'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ],
},
}],
[ 'node_report=="true"', {
'sources': [
'test/cctest/test_report_util.cc',
],
'defines': [
'NODE_REPORT',
'NODE_ARCH="<(target_arch)"',
'NODE_PLATFORM="<(OS)"',
],
'conditions': [
['OS=="win"', {
'libraries': [ 'Ws2_32' ],
}],
],
}],
['OS=="win"', {
'libraries': [
'Dbghelp.lib',
Expand Down

0 comments on commit 36ab39f

Please sign in to comment.