Skip to content

Commit 4dc660e

Browse files
author
Julien Gilli
committed
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>
1 parent 70195ac commit 4dc660e

1 file changed

Lines changed: 3 additions & 16 deletions

File tree

node.gyp

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,7 @@
245245
'conditions': [
246246
[ 'OS=="linux"', {
247247
'sources': [
248-
'<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o',
249-
'<(SHARED_INTERMEDIATE_DIR)/libuv_dtrace_provider.o',
248+
'<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o'
250249
],
251250
}],
252251
[ 'OS!="mac" and OS!="linux"', {
@@ -510,15 +509,13 @@
510509
{
511510
'action_name': 'node_dtrace_provider_o',
512511
'inputs': [
513-
'<(OBJ_DIR)/libuv/deps/uv/src/unix/core.o',
514512
'<(OBJ_DIR)/node/src/node_dtrace.o',
515513
],
516514
'outputs': [
517515
'<(OBJ_DIR)/node/src/node_dtrace_provider.o'
518516
],
519517
'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d',
520-
'-s', 'deps/uv/src/unix/uv-dtrace.d', '<@(_inputs)',
521-
'-o', '<@(_outputs)' ]
518+
'<@(_inputs)', '-o', '<@(_outputs)' ]
522519
}
523520
]
524521
}],
@@ -533,17 +530,7 @@
533530
'action': [
534531
'dtrace', '-C', '-G', '-s', '<@(_inputs)', '-o', '<@(_outputs)'
535532
],
536-
},
537-
{
538-
'action_name': 'libuv_dtrace_provider_o',
539-
'inputs': [ 'deps/uv/src/unix/uv-dtrace.d' ],
540-
'outputs': [
541-
'<(SHARED_INTERMEDIATE_DIR)/libuv_dtrace_provider.o'
542-
],
543-
'action': [
544-
'dtrace', '-C', '-G', '-s', '<@(_inputs)', '-o', '<@(_outputs)'
545-
],
546-
},
533+
}
547534
],
548535
}],
549536
]

0 commit comments

Comments
 (0)