Skip to content

Commit f1d3d92

Browse files
committed
build: remove node_report option in node.gyp
PR-URL: nodejs#32242 Fixes: nodejs#26293 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: David Carlier <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
1 parent a6bd2c2 commit f1d3d92

File tree

1 file changed

+13
-40
lines changed

1 file changed

+13
-40
lines changed

node.gyp

+13-40
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,8 @@
337337
'type': 'executable',
338338

339339
'defines': [
340+
'NODE_ARCH="<(target_arch)"',
341+
'NODE_PLATFORM="<(OS)"',
340342
'NODE_WANT_INTERNALS=1',
341343
],
342344

@@ -424,13 +426,6 @@
424426
'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ],
425427
},
426428
}],
427-
[ 'node_report=="true"', {
428-
'defines': [
429-
'NODE_REPORT',
430-
'NODE_ARCH="<(target_arch)"',
431-
'NODE_PLATFORM="<(OS)"',
432-
],
433-
}],
434429
['OS=="win"', {
435430
'libraries': [
436431
'Dbghelp.lib',
@@ -596,6 +591,9 @@
596591
'src/node_process_events.cc',
597592
'src/node_process_methods.cc',
598593
'src/node_process_object.cc',
594+
'src/node_report.cc',
595+
'src/node_report_module.cc',
596+
'src/node_report_utils.cc',
599597
'src/node_serdes.cc',
600598
'src/node_sockaddr.cc',
601599
'src/node_stat_watcher.cc',
@@ -685,6 +683,7 @@
685683
'src/node_perf_common.h',
686684
'src/node_platform.h',
687685
'src/node_process.h',
686+
'src/node_report.h',
688687
'src/node_revert.h',
689688
'src/node_root_certs.h',
690689
'src/node_sockaddr.h',
@@ -781,6 +780,7 @@
781780
'libraries': [
782781
'Dbghelp',
783782
'Psapi',
783+
'Ws2_32',
784784
],
785785
}],
786786
[ 'node_use_etw=="true"', {
@@ -865,23 +865,6 @@
865865
'src/tls_wrap.h'
866866
],
867867
}],
868-
[ 'node_report=="true"', {
869-
'sources': [
870-
'src/node_report.cc',
871-
'src/node_report_module.cc',
872-
'src/node_report_utils.cc',
873-
],
874-
'defines': [
875-
'NODE_REPORT',
876-
'NODE_ARCH="<(target_arch)"',
877-
'NODE_PLATFORM="<(OS)"',
878-
],
879-
'conditions': [
880-
['OS=="win"', {
881-
'libraries': [ 'Ws2_32' ],
882-
}],
883-
],
884-
}],
885868
[ 'OS in "linux freebsd mac" and '
886869
'target_arch=="x64" and '
887870
'node_target_type=="executable"', {
@@ -1138,7 +1121,11 @@
11381121
'test/cctest',
11391122
],
11401123

1141-
'defines': [ 'NODE_WANT_INTERNALS=1' ],
1124+
'defines': [
1125+
'NODE_ARCH="<(target_arch)"',
1126+
'NODE_PLATFORM="<(OS)"',
1127+
'NODE_WANT_INTERNALS=1',
1128+
],
11421129

11431130
'sources': [
11441131
'src/node_snapshot_stub.cc',
@@ -1155,6 +1142,7 @@
11551142
'test/cctest/test_linked_binding.cc',
11561143
'test/cctest/test_per_process.cc',
11571144
'test/cctest/test_platform.cc',
1145+
'test/cctest/test_report_util.cc',
11581146
'test/cctest/test_sockaddr.cc',
11591147
'test/cctest/test_traced_value.cc',
11601148
'test/cctest/test_util.cc',
@@ -1192,21 +1180,6 @@
11921180
'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ],
11931181
},
11941182
}],
1195-
[ 'node_report=="true"', {
1196-
'sources': [
1197-
'test/cctest/test_report_util.cc',
1198-
],
1199-
'defines': [
1200-
'NODE_REPORT',
1201-
'NODE_ARCH="<(target_arch)"',
1202-
'NODE_PLATFORM="<(OS)"',
1203-
],
1204-
'conditions': [
1205-
['OS=="win"', {
1206-
'libraries': [ 'Ws2_32' ],
1207-
}],
1208-
],
1209-
}],
12101183
['OS=="win"', {
12111184
'libraries': [
12121185
'Dbghelp.lib',

0 commit comments

Comments
 (0)