Skip to content

Commit 70eaba1

Browse files
cjihrigtargos
authored andcommitted
build: remove node_report option in node.gyp
PR-URL: #32242 Fixes: #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 0b310df commit 70eaba1

File tree

1 file changed

+13
-40
lines changed

1 file changed

+13
-40
lines changed

node.gyp

Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,8 @@
335335
'type': 'executable',
336336

337337
'defines': [
338+
'NODE_ARCH="<(target_arch)"',
339+
'NODE_PLATFORM="<(OS)"',
338340
'NODE_WANT_INTERNALS=1',
339341
],
340342

@@ -422,13 +424,6 @@
422424
'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ],
423425
},
424426
}],
425-
[ 'node_report=="true"', {
426-
'defines': [
427-
'NODE_REPORT',
428-
'NODE_ARCH="<(target_arch)"',
429-
'NODE_PLATFORM="<(OS)"',
430-
],
431-
}],
432427
['OS=="win"', {
433428
'libraries': [
434429
'Dbghelp.lib',
@@ -595,6 +590,9 @@
595590
'src/node_process_events.cc',
596591
'src/node_process_methods.cc',
597592
'src/node_process_object.cc',
593+
'src/node_report.cc',
594+
'src/node_report_module.cc',
595+
'src/node_report_utils.cc',
598596
'src/node_serdes.cc',
599597
'src/node_sockaddr.cc',
600598
'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',
@@ -783,6 +782,7 @@
783782
'libraries': [
784783
'Dbghelp',
785784
'Psapi',
785+
'Ws2_32',
786786
],
787787
}],
788788
[ 'node_use_etw=="true"', {
@@ -867,23 +867,6 @@
867867
'src/tls_wrap.h'
868868
],
869869
}],
870-
[ 'node_report=="true"', {
871-
'sources': [
872-
'src/node_report.cc',
873-
'src/node_report_module.cc',
874-
'src/node_report_utils.cc',
875-
],
876-
'defines': [
877-
'NODE_REPORT',
878-
'NODE_ARCH="<(target_arch)"',
879-
'NODE_PLATFORM="<(OS)"',
880-
],
881-
'conditions': [
882-
['OS=="win"', {
883-
'libraries': [ 'Ws2_32' ],
884-
}],
885-
],
886-
}],
887870
[ 'OS in "linux freebsd mac" and '
888871
'target_arch=="x64" and '
889872
'node_target_type=="executable"', {
@@ -1140,7 +1123,11 @@
11401123
'test/cctest',
11411124
],
11421125

1143-
'defines': [ 'NODE_WANT_INTERNALS=1' ],
1126+
'defines': [
1127+
'NODE_ARCH="<(target_arch)"',
1128+
'NODE_PLATFORM="<(OS)"',
1129+
'NODE_WANT_INTERNALS=1',
1130+
],
11441131

11451132
'sources': [
11461133
'src/node_snapshot_stub.cc',
@@ -1157,6 +1144,7 @@
11571144
'test/cctest/test_linked_binding.cc',
11581145
'test/cctest/test_per_process.cc',
11591146
'test/cctest/test_platform.cc',
1147+
'test/cctest/test_report_util.cc',
11601148
'test/cctest/test_sockaddr.cc',
11611149
'test/cctest/test_traced_value.cc',
11621150
'test/cctest/test_util.cc',
@@ -1194,21 +1182,6 @@
11941182
'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ],
11951183
},
11961184
}],
1197-
[ 'node_report=="true"', {
1198-
'sources': [
1199-
'test/cctest/test_report_util.cc',
1200-
],
1201-
'defines': [
1202-
'NODE_REPORT',
1203-
'NODE_ARCH="<(target_arch)"',
1204-
'NODE_PLATFORM="<(OS)"',
1205-
],
1206-
'conditions': [
1207-
['OS=="win"', {
1208-
'libraries': [ 'Ws2_32' ],
1209-
}],
1210-
],
1211-
}],
12121185
['OS=="win"', {
12131186
'libraries': [
12141187
'Dbghelp.lib',

0 commit comments

Comments
 (0)