daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: do not generate support for libuv's probes 

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 <trev.norris@gmail.com>
pull/236/head^2
Julien Gilli 2014-12-02 22:55:53 -08:00
parent 70195acbe3
commit 4dc660e164
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
node.gyp
View File

@ -245,8 +245,7 @@
'conditions': [ 'conditions': [
[ 'OS=="linux"', { [ 'OS=="linux"', {
'sources': [ 'sources': [
'<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o', '<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o'
'<(SHARED_INTERMEDIATE_DIR)/libuv_dtrace_provider.o',
], ],
}], }],
[ 'OS!="mac" and OS!="linux"', { [ 'OS!="mac" and OS!="linux"', {
@ -510,15 +509,13 @@
{ {
'action_name': 'node_dtrace_provider_o', 'action_name': 'node_dtrace_provider_o',
'inputs': [ 'inputs': [
'<(OBJ_DIR)/libuv/deps/uv/src/unix/core.o',
'<(OBJ_DIR)/node/src/node_dtrace.o', '<(OBJ_DIR)/node/src/node_dtrace.o',
], ],
'outputs': [ 'outputs': [
'<(OBJ_DIR)/node/src/node_dtrace_provider.o' '<(OBJ_DIR)/node/src/node_dtrace_provider.o'
], ],
'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d', 'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d',
'-s', 'deps/uv/src/unix/uv-dtrace.d', '<@(_inputs)', '<@(_inputs)', '-o', '<@(_outputs)' ]
'-o', '<@(_outputs)' ]
} }
] ]
}], }],
@ -533,17 +530,7 @@
'action': [ 'action': [
'dtrace', '-C', '-G', '-s', '<@(_inputs)', '-o', '<@(_outputs)' '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)'
],
},
], ],
}], }],
] ]