mirror of
https://github.com/nodejs/node.git
synced 2026-11-09 15:11:11 -05:00
build: fix build with systemtap providers enabled
The "dtrace" script version include in systemtap-sdt-devel-2.6-3 (part of Fedora 21) no longer ignores unknown command line arguments, but will instead error out and refuse to run. This patch adds a separate condition to node's gyp input so that on Linux it will run dtrace without the -xnolibs argument that trips it up on systemtap-std-devel-2.6-3. PR-URL: https://github.com/joyent/node/pull/8846 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
1 parent
1afa862978
commit
691d55feca
1 file changed
+13
-2
@@ -466,7 +466,7 @@
|
||||
'target_name': 'node_dtrace_header',
|
||||
'type': 'none',
|
||||
'conditions': [
|
||||
[ 'node_use_dtrace=="true"', {
|
||||
[ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', {
|
||||
'actions': [
|
||||
{
|
||||
'action_name': 'node_dtrace_header',
|
||||
@@ -476,7 +476,18 @@
|
||||
'-o', '<@(_outputs)' ]
|
||||
}
|
||||
]
|
||||
} ]
|
||||
} ],
|
||||
[ 'node_use_dtrace=="true" and OS=="linux"', {
|
||||
'actions': [
|
||||
{
|
||||
'action_name': 'node_dtrace_header',
|
||||
'inputs': [ 'src/node_provider.d' ],
|
||||
'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/node_provider.h' ],
|
||||
'action': [ 'dtrace', '-h', '-s', '<@(_inputs)',
|
||||
'-o', '<@(_outputs)' ]
|
||||
}
|
||||
]
|
||||
} ],
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user