diff options
| author | Fedor Indutny <fedor.indutny@gmail.com> | 2013-02-26 07:57:12 +0000 |
|---|---|---|
| committer | Fedor Indutny <fedor.indutny@gmail.com> | 2013-02-26 07:57:12 +0000 |
| commit | 3d913fec83e7290fd0f694027f7f9904ffd09970 (patch) | |
| tree | d419acf729b992eaa3c4016bb015b1ecfcf081fa /node.gyp | |
| parent | 88befa6021d136257939a2caba14e69ad9c43dd5 (diff) | |
| download | node-3d913fec83e7290fd0f694027f7f9904ffd09970.tar.gz | |
Revert "sunos: unbreak build after v8 downgrade"
This reverts commit f80f3c5f62a3955636c1af1872ef9539a0b01cb0.
Diffstat (limited to 'node.gyp')
| -rw-r--r-- | node.gyp | 26 |
1 files changed, 16 insertions, 10 deletions
@@ -168,13 +168,9 @@ # 'sources': [ 'src/node_dtrace.cc', - 'src/node_dtrace_provider.cc' + 'src/node_dtrace_provider.cc', + 'src/node_dtrace_ustack.cc', ], - 'conditions': [ [ - 'target_arch=="ia32"', { - 'sources': [ 'src/node_dtrace_ustack.cc' ] - } - ] ], } ], [ 'node_use_systemtap=="true"', { 'defines': [ 'HAVE_SYSTEMTAP=1', 'STAP_SDT_V1=1' ], @@ -423,7 +419,7 @@ 'target_name': 'node_dtrace_ustack', 'type': 'none', 'conditions': [ - [ 'node_use_dtrace=="true" and target_arch=="ia32"', { + [ 'node_use_dtrace=="true"', { 'actions': [ { 'action_name': 'node_dtrace_ustack_constants', @@ -448,9 +444,19 @@ 'outputs': [ '<(PRODUCT_DIR)/obj.target/node/src/node_dtrace_ustack.o' ], - 'action': [ - 'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc', - '-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)', + 'conditions': [ + [ 'target_arch=="ia32"', { + 'action': [ + 'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc', + '-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)', + ] + } ], + [ 'target_arch=="x64"', { + 'action': [ + 'dtrace', '-64', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc', + '-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)', + ] + } ], ] } ] |