Browse Source

gyp: fix `ninja` build on linux

fix #6679
v0.10.25-release
Fedor Indutny 11 years ago
parent
commit
61c0d571bf
  1. 9
      common.gypi
  2. 10
      node.gyp

9
common.gypi

@ -19,7 +19,14 @@
'conditions': [ 'conditions': [
['OS != "win"', { ['OS != "win"', {
'v8_postmortem_support': 'true' 'v8_postmortem_support': 'true'
}] }],
['GENERATOR == "ninja"', {
'OBJ_DIR': '<(PRODUCT_DIR)/obj',
'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
}, {
'OBJ_DIR': '<(PRODUCT_DIR)/obj.target',
'V8_BASE': '<(OBJ_DIR)/deps/v8/tools/gyp/libv8_base.a',
}],
], ],
}, },

10
node.gyp

@ -293,7 +293,7 @@
[ [
'OS=="linux" and node_shared_v8=="false"', { 'OS=="linux" and node_shared_v8=="false"', {
'ldflags': [ 'ldflags': [
'-Wl,--whole-archive <(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.a -Wl,--no-whole-archive', '-Wl,--whole-archive <(V8_BASE) -Wl,--no-whole-archive',
], ],
}], }],
], ],
@ -427,10 +427,10 @@
'action_name': 'node_dtrace_provider_o', 'action_name': 'node_dtrace_provider_o',
'inputs': [ 'inputs': [
'src/node_provider.d', 'src/node_provider.d',
'<(PRODUCT_DIR)/obj.target/node/src/node_dtrace.o' '<(OBJ_DIR)/node/src/node_dtrace.o'
], ],
'outputs': [ 'outputs': [
'<(PRODUCT_DIR)/obj.target/node/src/node_dtrace_provider.o' '<(OBJ_DIR)/node/src/node_dtrace_provider.o'
], ],
'action': [ 'dtrace', '-G', '-xnolibs', '-s', '<@(_inputs)', 'action': [ 'dtrace', '-G', '-xnolibs', '-s', '<@(_inputs)',
'-o', '<@(_outputs)' ] '-o', '<@(_outputs)' ]
@ -448,7 +448,7 @@
{ {
'action_name': 'node_dtrace_ustack_constants', 'action_name': 'node_dtrace_ustack_constants',
'inputs': [ 'inputs': [
'<(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.a' '<(V8_BASE)'
], ],
'outputs': [ 'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h' '<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
@ -466,7 +466,7 @@
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h' '<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
], ],
'outputs': [ 'outputs': [
'<(PRODUCT_DIR)/obj.target/node/src/node_dtrace_ustack.o' '<(OBJ_DIR)/node/src/node_dtrace_ustack.o'
], ],
'conditions': [ 'conditions': [
[ 'target_arch=="ia32"', { [ 'target_arch=="ia32"', {

Loading…
Cancel
Save