Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 96ad768

Browse filesBrowse files
cjihrigMylesBorins
authored andcommitted
build: remove node_report option in node.gyp
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>
1 parent 1950c08 commit 96ad768
Copy full SHA for 96ad768

File tree

Expand file treeCollapse file tree

1 file changed

+13
-40
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+13
-40
lines changed
Open diff view settings
Collapse file

‎node.gyp‎

Copy file name to clipboardExpand all lines: node.gyp
+13-40Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,8 @@
336336
'type': 'executable',
337337

338338
'defines': [
339+
'NODE_ARCH="<(target_arch)"',
340+
'NODE_PLATFORM="<(OS)"',
339341
'NODE_WANT_INTERNALS=1',
340342
],
341343

@@ -423,13 +425,6 @@
423425
'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ],
424426
},
425427
}],
426-
[ 'node_report=="true"', {
427-
'defines': [
428-
'NODE_REPORT',
429-
'NODE_ARCH="<(target_arch)"',
430-
'NODE_PLATFORM="<(OS)"',
431-
],
432-
}],
433428
['OS=="win"', {
434429
'libraries': [
435430
'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',
@@ -684,6 +682,7 @@
684682
'src/node_perf_common.h',
685683
'src/node_platform.h',
686684
'src/node_process.h',
685+
'src/node_report.h',
687686
'src/node_revert.h',
688687
'src/node_root_certs.h',
689688
'src/node_sockaddr.h',
@@ -780,6 +779,7 @@
780779
'libraries': [
781780
'Dbghelp',
782781
'Psapi',
782+
'Ws2_32',
783783
],
784784
}],
785785
[ 'node_use_etw=="true"', {
@@ -864,23 +864,6 @@
864864
'src/tls_wrap.h'
865865
],
866866
}],
867-
[ 'node_report=="true"', {
868-
'sources': [
869-
'src/node_report.cc',
870-
'src/node_report_module.cc',
871-
'src/node_report_utils.cc',
872-
],
873-
'defines': [
874-
'NODE_REPORT',
875-
'NODE_ARCH="<(target_arch)"',
876-
'NODE_PLATFORM="<(OS)"',
877-
],
878-
'conditions': [
879-
['OS=="win"', {
880-
'libraries': [ 'Ws2_32' ],
881-
}],
882-
],
883-
}],
884867
[ 'OS in "linux freebsd mac" and '
885868
'target_arch=="x64" and '
886869
'node_target_type=="executable"', {
@@ -1137,7 +1120,11 @@
11371120
'test/cctest',
11381121
],
11391122

1140-
'defines': [ 'NODE_WANT_INTERNALS=1' ],
1123+
'defines': [
1124+
'NODE_ARCH="<(target_arch)"',
1125+
'NODE_PLATFORM="<(OS)"',
1126+
'NODE_WANT_INTERNALS=1',
1127+
],
11411128

11421129
'sources': [
11431130
'src/node_snapshot_stub.cc',
@@ -1154,6 +1141,7 @@
11541141
'test/cctest/test_linked_binding.cc',
11551142
'test/cctest/test_per_process.cc',
11561143
'test/cctest/test_platform.cc',
1144+
'test/cctest/test_report_util.cc',
11571145
'test/cctest/test_sockaddr.cc',
11581146
'test/cctest/test_traced_value.cc',
11591147
'test/cctest/test_util.cc',
@@ -1191,21 +1179,6 @@
11911179
'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ],
11921180
},
11931181
}],
1194-
[ 'node_report=="true"', {
1195-
'sources': [
1196-
'test/cctest/test_report_util.cc',
1197-
],
1198-
'defines': [
1199-
'NODE_REPORT',
1200-
'NODE_ARCH="<(target_arch)"',
1201-
'NODE_PLATFORM="<(OS)"',
1202-
],
1203-
'conditions': [
1204-
['OS=="win"', {
1205-
'libraries': [ 'Ws2_32' ],
1206-
}],
1207-
],
1208-
}],
12091182
['OS=="win"', {
12101183
'libraries': [
12111184
'Dbghelp.lib',

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.