diff options
| author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-03-15 05:31:31 +0100 |
|---|---|---|
| committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-03-17 13:50:27 +0100 |
| commit | f0d4237ef537a6aacac1c4b548c433d59f6be509 (patch) | |
| tree | f342808255315a5ee30683f06144b923eb03ead7 /common.gypi | |
| parent | d631af59c0c4bf0811c7176176bf78f68e9fab6d (diff) | |
| download | android-node-v8-f0d4237ef537a6aacac1c4b548c433d59f6be509.tar.gz android-node-v8-f0d4237ef537a6aacac1c4b548c433d59f6be509.tar.bz2 android-node-v8-f0d4237ef537a6aacac1c4b548c433d59f6be509.zip | |
build: mac OBJ_DIR should point to obj.target
I think there might be an issue with the value of OBJ_DIR when
using a "mac" os. The value is currently specified in common.gypi
which is included by node.gyp:
'OBJ_DIR': '<(PRODUCT_DIR)/obj',
In the generated Makefile (out/Makefile) the object output directory
is:
obj := $(builddir)/obj
And in the included node.target.mk we have the OBJS declared:
OBJS := \
$(obj).target/$(TARGET)/src/async-wrap.o \
$(obj).target/$(TARGET)/src/cares_wrap.o \
If OBJ_DIR is used in node.gyp to point to generated object files
on mac they will not be found.
PR-URL: https://github.com/nodejs/node/pull/11857
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common.gypi b/common.gypi index 3aad8e7722..147cc70fa5 100644 --- a/common.gypi +++ b/common.gypi @@ -43,7 +43,7 @@ 'v8_postmortem_support%': 'true', }], ['OS== "mac"', { - 'OBJ_DIR': '<(PRODUCT_DIR)/obj', + 'OBJ_DIR': '<(PRODUCT_DIR)/obj.target', 'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a', }, { 'conditions': [ |