diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-24 19:13:50 -0800 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-24 19:13:50 -0800 |
| commit | c1b1f312035644fd33cbc59cacd7980e7ed432da (patch) | |
| tree | 789d6f0b74c158d9d95414d09dbe7c6c08bd115d /common.gypi | |
| parent | 640912d18a63704fd493059a72b19e6367c2fc1c (diff) | |
| parent | 9975ff603b5ba0e5f4b2f0ffb07474a9013dab36 (diff) | |
| download | node-new-c1b1f312035644fd33cbc59cacd7980e7ed432da.tar.gz | |
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 'common.gypi')
| -rw-r--r-- | common.gypi | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/common.gypi b/common.gypi index e25e0cc7f6..6d6a43d5ec 100644 --- a/common.gypi +++ b/common.gypi @@ -19,7 +19,14 @@ }, { 'os_posix': 1, 'v8_postmortem_support': 'true' - }] + }], + ['GENERATOR == "ninja"', { + 'OBJ_DIR': '<(PRODUCT_DIR)/obj', + 'V8_BASE': '<(PRODUCT_DIR)/libv8_base.<(target_arch).a', + }, { + 'OBJ_DIR': '<(PRODUCT_DIR)/obj.target', + 'V8_BASE': '<(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.<(target_arch).a', + }], ], }, |