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 91385be
1 file changed
Lines changed: 14 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -879,7 +879,20 @@ | |||
| 879 | 879 | [ 'node_use_dtrace=="true"', { | |
| 880 | 880 | 'libraries': [ | |
| 881 | 881 | '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)', | |
| 882 | - ] | ||
| 882 | + ], | ||
| 883 | + 'conditions': [ | ||
| 884 | + ['OS!="mac" and OS!="linux"', { | ||
| 885 | + 'libraries': [ | ||
| 886 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_provider.<(OBJ_SUFFIX)', | ||
| 887 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_ustack.<(OBJ_SUFFIX)', | ||
| 888 | + ] | ||
| 889 | + }], | ||
| 890 | + ['OS=="linux"', { | ||
| 891 | + 'libraries': [ | ||
| 892 | + '<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o', | ||
| 893 | + ] | ||
| 894 | + }], | ||
| 895 | + ], | ||
| 883 | 896 | }], | |
| 884 | 897 | [ 'OS=="win"', { | |
| 885 | 898 | 'libraries': [ | |
@@ -890,16 +903,6 @@ | |||
| 890 | 903 | '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)', | |
| 891 | 904 | ], | |
| 892 | 905 | }], | |
| 893 | - [ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', { | ||
| 894 | - 'copies': [{ | ||
| 895 | - 'destination': '<(OBJ_DIR)/cctest/src', | ||
| 896 | - 'files': [ | ||
| 897 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_ustack.<(OBJ_SUFFIX)', | ||
| 898 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_provider.<(OBJ_SUFFIX)', | ||
| 899 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)', | ||
| 900 | - ]}, | ||
| 901 | - ], | ||
| 902 | - }], | ||
| 903 | 906 | [ 'node_shared_zlib=="false"', { | |
| 904 | 907 | 'dependencies': [ | |
| 905 | 908 | 'deps/zlib/zlib.gyp:zlib', | |
0 commit comments