Skip to content

Commit 5244ee3

Browse files
danbevitaloacasas
authored andcommitted
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: #11857 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent a7e4b02 commit 5244ee3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
'v8_postmortem_support%': 'true',
4444
}],
4545
['OS== "mac"', {
46-
'OBJ_DIR': '<(PRODUCT_DIR)/obj',
46+
'OBJ_DIR': '<(PRODUCT_DIR)/obj.target',
4747
'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
4848
}, {
4949
'conditions': [

0 commit comments

Comments
 (0)