Skip to content

Commit 924b116

Browse files
richardlautargos
authored andcommitted
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> Backport-PR-URL: nodejs#32092 PR-URL: nodejs#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 b3d179e commit 924b116

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
@@ -248,6 +248,11 @@
248248
'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
249249
'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
250250
'conditions': [
251+
['GENERATOR == "ninja"', {
252+
'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'
253+
}, {
254+
'node_text_start_object_path': 'node_text_start/src/large_pages/node_text_start.o'
255+
}],
251256
[ 'node_shared=="true"', {
252257
'node_target_type%': 'shared_library',
253258
'conditions': [
@@ -513,7 +518,7 @@
513518
'target_arch=="x64"', {
514519
'dependencies': [ 'node_text_start' ],
515520
'ldflags+': [
516-
'<(PRODUCT_DIR)/obj.target/node_text_start/src/large_pages/node_text_start.o'
521+
'<(obj_dir)/<(node_text_start_object_path)'
517522
]
518523
}],
519524
],

0 commit comments

Comments
 (0)