Commit 91385be
build: fix cctest target --with-dtrace
Currently the cctest target will fail on linux when configured
--with-dtrace:
/node-v9.2.0/out/Release/obj.target/node/src/node_dtrace.o:
In function `node::DTRACE_NET_SERVER_CONNECTION(
v8::FunctionCallbackInfo<v8::Value> const&)':
node_dtrace.cc:(.text+0x103): undefined reference to
`node_net__server__connection_semaphore'
/node-v9.2.0/out/Release/obj.target/node/src/node_dtrace.o:
In function `node::DTRACE_NET_STREAM_END(
v8::FunctionCallbackInfo<v8::Value> const&)':
...
This is because node_dtrace_provider.o is not linked by the cctest
target.
This commit tries to fix and simplify the conditions in cctest target
so that node_dtrace.o is included for all operating systems that support
dtrace, include node_dtrace_ustack.o for all operating systems except
mac and linux, and include node_dtrace_provider.o for all operating
systems except mac.
PR-URL: #17039
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>1 parent 17e31dc commit 91385beCopy full SHA for 91385be
File tree
Expand file treeCollapse file tree
1 file changed
+14
-11
lines changedOpen diff view settings
Filter options
Expand file treeCollapse file tree
1 file changed
+14
-11
lines changedOpen diff view settings
Collapse file
+14-11Lines changed: 14 additions & 11 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
879 | 879 | |
880 | 880 | |
881 | 881 | |
882 | | - |
| 882 | + |
| 883 | + |
| 884 | + |
| 885 | + |
| 886 | + |
| 887 | + |
| 888 | + |
| 889 | + |
| 890 | + |
| 891 | + |
| 892 | + |
| 893 | + |
| 894 | + |
| 895 | + |
883 | 896 | |
884 | 897 | |
885 | 898 | |
| ||
890 | 903 | |
891 | 904 | |
892 | 905 | |
893 | | - |
894 | | - |
895 | | - |
896 | | - |
897 | | - |
898 | | - |
899 | | - |
900 | | - |
901 | | - |
902 | | - |
903 | 906 | |
904 | 907 | |
905 | 908 | |
|
0 commit comments