summaryrefslogtreecommitdiff
path: root/node.gyp
diff options
context:
space:
mode:
authorFedor Indutny <fedor.indutny@gmail.com>2014-01-16 16:39:12 +0000
committerFedor Indutny <fedor.indutny@gmail.com>2014-01-16 17:11:04 +0000
commit61c0d571bf6317807fd0d569099397e5b26b09b9 (patch)
tree24210720c4ce658cc3d95854cbade74ca037d418 /node.gyp
parentabe02553f22e80681b8c623c2b0dd20a9952aaae (diff)
downloadandroid-node-v8-61c0d571bf6317807fd0d569099397e5b26b09b9.tar.gz
android-node-v8-61c0d571bf6317807fd0d569099397e5b26b09b9.tar.bz2
android-node-v8-61c0d571bf6317807fd0d569099397e5b26b09b9.zip
gyp: fix `ninja` build on linux
fix #6679
Diffstat (limited to 'node.gyp')
-rw-r--r--node.gyp10
1 files changed, 5 insertions, 5 deletions
diff --git a/node.gyp b/node.gyp
index ae8c7e5e26..28714b3f7b 100644
--- a/node.gyp
+++ b/node.gyp
@@ -293,7 +293,7 @@
[
'OS=="linux" and node_shared_v8=="false"', {
'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',
'inputs': [
'src/node_provider.d',
- '<(PRODUCT_DIR)/obj.target/node/src/node_dtrace.o'
+ '<(OBJ_DIR)/node/src/node_dtrace.o'
],
'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)',
'-o', '<@(_outputs)' ]
@@ -448,7 +448,7 @@
{
'action_name': 'node_dtrace_ustack_constants',
'inputs': [
- '<(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.a'
+ '<(V8_BASE)'
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
@@ -466,7 +466,7 @@
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
],
'outputs': [
- '<(PRODUCT_DIR)/obj.target/node/src/node_dtrace_ustack.o'
+ '<(OBJ_DIR)/node/src/node_dtrace_ustack.o'
],
'conditions': [
[ 'target_arch=="ia32"', {