diff options
author | Kenan Yildirim <kenan@kenany.me> | 2017-02-13 13:31:56 -0500 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2017-02-16 17:16:26 -0800 |
commit | 70afe9d3ac585a362b3130b17e8a83d915e1ab73 (patch) | |
tree | 08212242f19ee42a5d0db34bb5fdde3daed0b51f /node.gyp | |
parent | 4577775a0604e510e6694e036fd6f3584102bde6 (diff) | |
download | android-node-v8-70afe9d3ac585a362b3130b17e8a83d915e1ab73.tar.gz android-node-v8-70afe9d3ac585a362b3130b17e8a83d915e1ab73.tar.bz2 android-node-v8-70afe9d3ac585a362b3130b17e8a83d915e1ab73.zip |
build: fix building with ninja on linux
On Linux, `ninja` appears to place `libv8_base.a` inside `OBJ_DIR`, as opposed
to `ninja` on OS X which places it outside of that directory. Furthermore, the
expected `OBJ_DIR` value (`obj.target/`) is actually just `obj/` for `ninja`.
This patch solves both of these issues by setting `OBJ_DIR` and `V8_BASE` to the
correct values for `ninja` on Linux specifically.
PR-URL: https://github.com/nodejs/node/pull/11348
Fixes: https://github.com/nodejs/node/issues/9861
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'node.gyp')
-rw-r--r-- | node.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -392,7 +392,7 @@ ['OS in "linux freebsd" and node_shared=="false"', { 'ldflags': [ '-Wl,--whole-archive,' - '<(PRODUCT_DIR)/obj.target/deps/openssl/' + '<(OBJ_DIR)/deps/openssl/' '<(OPENSSL_PRODUCT)', '-Wl,--no-whole-archive', ], |