Skip to content

Commit 9c1ac50

Browse files
richardlauMylesBorins
authored andcommittedMar 4, 2020
build: fix building with ninja
The ninja build places objects in a different directory. Co-authored-by: Gabriel Schulhof <gabriel.schulhof@intel.com> Signed-off-by: Richard Lau <riclau@uk.ibm.com> PR-URL: #32071 Reviewed-By: Matheus Marchini <mat@mmarchini.me> Reviewed-By: Gabriel Schulhof <gabriel.schulhof@intel.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
1 parent 4dc59b9 commit 9c1ac50

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed
 

‎node.gyp

+6-1
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,11 @@
250250
'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
251251
'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
252252
'conditions': [
253+
['GENERATOR == "ninja"', {
254+
'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'
255+
}, {
256+
'node_text_start_object_path': 'node_text_start/src/large_pages/node_text_start.o'
257+
}],
253258
[ 'node_shared=="true"', {
254259
'node_target_type%': 'shared_library',
255260
'conditions': [
@@ -515,7 +520,7 @@
515520
'target_arch=="x64"', {
516521
'dependencies': [ 'node_text_start' ],
517522
'ldflags+': [
518-
'<(PRODUCT_DIR)/obj.target/node_text_start/src/large_pages/node_text_start.o'
523+
'<(obj_dir)/<(node_text_start_object_path)'
519524
]
520525
}],
521526
],

0 commit comments

Comments
 (0)
Please sign in to comment.