diff options
author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-25 07:13:50 +0400 |
---|---|---|
committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-25 07:13:50 +0400 |
commit | c1b1f312035644fd33cbc59cacd7980e7ed432da (patch) | |
tree | 789d6f0b74c158d9d95414d09dbe7c6c08bd115d /node.gyp | |
parent | 640912d18a63704fd493059a72b19e6367c2fc1c (diff) | |
parent | 9975ff603b5ba0e5f4b2f0ffb07474a9013dab36 (diff) |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
AUTHORS
ChangeLog
deps/uv/AUTHORS
deps/uv/ChangeLog
deps/uv/src/unix/process.c
deps/uv/src/version.c
lib/net.js
node.gyp
src/node_version.h
Diffstat (limited to 'node.gyp')
-rw-r--r-- | node.gyp | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -324,7 +324,7 @@ [ 'OS=="linux" and node_shared_v8=="false"', { 'ldflags': [ - '-Wl,--whole-archive <(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.<(target_arch).a -Wl,--no-whole-archive', + '-Wl,--whole-archive <(V8_BASE) -Wl,--no-whole-archive', ], }], ], @@ -462,11 +462,11 @@ { 'action_name': 'node_dtrace_provider_o', 'inputs': [ - '<(PRODUCT_DIR)/obj.target/libuv/deps/uv/src/unix/core.o', - '<(PRODUCT_DIR)/obj.target/node/src/node_dtrace.o', + '<(OBJ_DIR)/libuv/deps/uv/src/unix/core.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', 'src/node_provider.d', '-s', 'deps/uv/src/unix/uv-dtrace.d', '<@(_inputs)', @@ -509,7 +509,7 @@ { 'action_name': 'node_dtrace_ustack_constants', 'inputs': [ - '<(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.<(target_arch).a' + '<(V8_BASE)' ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/v8constants.h' @@ -527,7 +527,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"', { |