Skip to content

Commit 691d55f

Browse files
evantorriebnoordhuis
authored andcommitted
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: nodejs/node-v0.x-archive#8846 Reviewed-By: Ben Noordhuis <[email protected]>
1 parent 1afa862 commit 691d55f

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

node.gyp

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@
466466
'target_name': 'node_dtrace_header',
467467
'type': 'none',
468468
'conditions': [
469-
[ 'node_use_dtrace=="true"', {
469+
[ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', {
470470
'actions': [
471471
{
472472
'action_name': 'node_dtrace_header',
@@ -476,7 +476,18 @@
476476
'-o', '<@(_outputs)' ]
477477
}
478478
]
479-
} ]
479+
} ],
480+
[ 'node_use_dtrace=="true" and OS=="linux"', {
481+
'actions': [
482+
{
483+
'action_name': 'node_dtrace_header',
484+
'inputs': [ 'src/node_provider.d' ],
485+
'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/node_provider.h' ],
486+
'action': [ 'dtrace', '-h', '-s', '<@(_inputs)',
487+
'-o', '<@(_outputs)' ]
488+
}
489+
]
490+
} ],
480491
]
481492
},
482493
{

0 commit comments

Comments
 (0)