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 bb5a3aa

Browse filesBrowse files
danbevgibfahn
danbev
authored and
gibfahn
committed
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 826e718 commit bb5a3aa
Copy full SHA for bb5a3aa

File tree

Expand file treeCollapse file tree

1 file changed

+14
-11
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+14
-11
lines changed
Open diff view settings
Collapse file

‎node.gyp‎

Copy file name to clipboardExpand all lines: node.gyp
+14-11Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,20 @@
862862
[ 'node_use_dtrace=="true"', {
863863
'libraries': [
864864
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
865-
]
865+
],
866+
'conditions': [
867+
['OS!="mac" and OS!="linux"', {
868+
'libraries': [
869+
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_provider.<(OBJ_SUFFIX)',
870+
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_ustack.<(OBJ_SUFFIX)',
871+
]
872+
}],
873+
['OS=="linux"', {
874+
'libraries': [
875+
'<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o',
876+
]
877+
}],
878+
],
866879
}],
867880
[ 'OS=="win"', {
868881
'libraries': [
@@ -873,16 +886,6 @@
873886
'<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)',
874887
],
875888
}],
876-
[ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', {
877-
'copies': [{
878-
'destination': '<(OBJ_DIR)/cctest/src',
879-
'files': [
880-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_ustack.<(OBJ_SUFFIX)',
881-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_provider.<(OBJ_SUFFIX)',
882-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
883-
]},
884-
],
885-
}],
886889
[ 'node_shared_zlib=="false"', {
887890
'dependencies': [
888891
'deps/zlib/zlib.gyp:zlib',

0 commit comments

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