1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: fix build with systemtap providers enabled

Browse Source 
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:
Evan Torrie 2014-12-09 11:02:39 -08:00 committed by Ben Noordhuis
parent 1afa862978
commit 691d55feca
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
node.gyp
View File

@ -466,7 +466,7 @@
'target_name': 'node_dtrace_header', 'target_name': 'node_dtrace_header',
'type': 'none', 'type': 'none',
'conditions': [ 'conditions': [
[ 'node_use_dtrace=="true"', { [ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', {
'actions': [ 'actions': [
{ {
'action_name': 'node_dtrace_header', 'action_name': 'node_dtrace_header',
@ -476,7 +476,18 @@
'-o', '<@(_outputs)' ] '-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)' ]
}
]
} ],
] ]
}, },
{ {