Skip to content

Commit

Permalink
build: do not generate support for libuv's probes
Browse files Browse the repository at this point in the history
Dtrace probes were removed from libuv recently, but their usage by node
was not completely removed, causing build breaks on SmartOS.

Even though the build is working on other platforms, these probes are
not fired by libuv anymore, so there's no point in using them on these
platforms too.

Reviewed-by: Trevor Norris <[email protected]>
  • Loading branch information
Julien Gilli committed Dec 9, 2014
1 parent 70195ac commit 4dc660e
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,7 @@
'conditions': [
[ 'OS=="linux"', {
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o',
'<(SHARED_INTERMEDIATE_DIR)/libuv_dtrace_provider.o',
'<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o'
],
}],
[ 'OS!="mac" and OS!="linux"', {
Expand Down Expand Up @@ -510,15 +509,13 @@
{
'action_name': 'node_dtrace_provider_o',
'inputs': [
'<(OBJ_DIR)/libuv/deps/uv/src/unix/core.o',
'<(OBJ_DIR)/node/src/node_dtrace.o',
],
'outputs': [
'<(OBJ_DIR)/node/src/node_dtrace_provider.o'
],
'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d',
'-s', 'deps/uv/src/unix/uv-dtrace.d', '<@(_inputs)',
'-o', '<@(_outputs)' ]
'<@(_inputs)', '-o', '<@(_outputs)' ]
}
]
}],
Expand All @@ -533,17 +530,7 @@
'action': [
'dtrace', '-C', '-G', '-s', '<@(_inputs)', '-o', '<@(_outputs)'
],
},
{
'action_name': 'libuv_dtrace_provider_o',
'inputs': [ 'deps/uv/src/unix/uv-dtrace.d' ],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/libuv_dtrace_provider.o'
],
'action': [
'dtrace', '-C', '-G', '-s', '<@(_inputs)', '-o', '<@(_outputs)'
],
},
}
],
}],
]
Expand Down

0 comments on commit 4dc660e

Please sign in to comment.