diff options
| author | Richard Lau <riclau@uk.ibm.com> | 2020-03-03 23:02:02 +0300 |
|---|---|---|
| committer | Richard Lau <riclau@uk.ibm.com> | 2020-03-04 07:49:00 +0300 |
| commit | de6cbd0e374e3d9209ddf56d1041b83b41efcbe6 (patch) | |
| tree | 4c0008213d69e0dc9bca0a59b449fc294aa663d8 /node.gyp | |
| parent | 8429295c5b2bf3eb52a5b57eaceaffc3158a0c4a (diff) | |
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: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'node.gyp')
| -rw-r--r-- | node.gyp | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -251,6 +251,11 @@ 'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)', 'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)', 'conditions': [ + ['GENERATOR == "ninja"', { + 'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o' + }, { + 'node_text_start_object_path': 'node_text_start/src/large_pages/node_text_start.o' + }], [ 'node_shared=="true"', { 'node_target_type%': 'shared_library', 'conditions': [ @@ -516,7 +521,7 @@ 'target_arch=="x64"', { 'dependencies': [ 'node_text_start' ], 'ldflags+': [ - '<(PRODUCT_DIR)/obj.target/node_text_start/src/large_pages/node_text_start.o' + '<(obj_dir)/<(node_text_start_object_path)' ] }], ], |