Skip to content

Commit de6cbd0

Browse files
committed
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 8429295 commit de6cbd0

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

node.gyp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,11 @@
251251
'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
252252
'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
253253
'conditions': [
254+
['GENERATOR == "ninja"', {
255+
'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'
256+
}, {
257+
'node_text_start_object_path': 'node_text_start/src/large_pages/node_text_start.o'
258+
}],
254259
[ 'node_shared=="true"', {
255260
'node_target_type%': 'shared_library',
256261
'conditions': [
@@ -516,7 +521,7 @@
516521
'target_arch=="x64"', {
517522
'dependencies': [ 'node_text_start' ],
518523
'ldflags+': [
519-
'<(PRODUCT_DIR)/obj.target/node_text_start/src/large_pages/node_text_start.o'
524+
'<(obj_dir)/<(node_text_start_object_path)'
520525
]
521526
}],
522527
],

0 commit comments

Comments
 (0)