Skip to content

Commit

Permalink
build: fix build with systemtap providers enabled
Browse files Browse the repository at this point in the history
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: nodejs/node-v0.x-archive#8846
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
evantorrie authored and bnoordhuis committed Dec 9, 2014
1 parent 1afa862 commit 691d55f
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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)' ]
}
]
} ],
]
},
{
Expand Down

0 comments on commit 691d55f

Please sign in to comment.