Nodejs/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2024-11-21 10:59:27 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

build: compile bundled simdutf conditionally

Browse Source 
The --shared-simdutf flag was introduced in #52924, but the
implementation was incomplete.

Resolves #52914

PR-URL: https://github.com/nodejs/node/pull/55886
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
This commit is contained in:
Jakub Jirutka 2024-11-16 19:17:17 +01:00 committed by Node.js GitHub Bot
parent dd15563a47
commit 64c647e342
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
node.gyp
View File

@ -849,7 +849,6 @@
'dependencies': [ 'dependencies': [
'deps/googletest/googletest.gyp:gtest_prod', 'deps/googletest/googletest.gyp:gtest_prod',
'deps/histogram/histogram.gyp:histogram', 'deps/histogram/histogram.gyp:histogram',
'deps/simdutf/simdutf.gyp:simdutf',
'deps/nbytes/nbytes.gyp:nbytes', 'deps/nbytes/nbytes.gyp:nbytes',
'node_js2c#host', 'node_js2c#host',
], ],
@ -1170,7 +1169,6 @@
'deps/googletest/googletest.gyp:gtest', 'deps/googletest/googletest.gyp:gtest',
'deps/googletest/googletest.gyp:gtest_main', 'deps/googletest/googletest.gyp:gtest_main',
'deps/histogram/histogram.gyp:histogram', 'deps/histogram/histogram.gyp:histogram',
'deps/simdutf/simdutf.gyp:simdutf',
'deps/nbytes/nbytes.gyp:nbytes', 'deps/nbytes/nbytes.gyp:nbytes',
], ],
@ -1322,9 +1320,6 @@
'target_name': 'node_js2c', 'target_name': 'node_js2c',
'type': 'executable', 'type': 'executable',
'toolsets': ['host'], 'toolsets': ['host'],
'dependencies': [
'deps/simdutf/simdutf.gyp:simdutf#host',
],
'include_dirs': [ 'include_dirs': [
'tools', 'tools',
'src', 'src',
@ -1336,6 +1331,9 @@
'src/embedded_data.cc', 'src/embedded_data.cc',
], ],
'conditions': [ 'conditions': [
[ 'node_shared_simdutf=="false"', {
'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf#host' ],
}],
[ 'node_shared_libuv=="false"', { [ 'node_shared_libuv=="false"', {
'dependencies': [ 'deps/uv/uv.gyp:libuv#host' ], 'dependencies': [ 'deps/uv/uv.gyp:libuv#host' ],
}], }],
@ -1362,7 +1360,6 @@
'<(node_lib_target_name)', '<(node_lib_target_name)',
'deps/histogram/histogram.gyp:histogram', 'deps/histogram/histogram.gyp:histogram',
'deps/nbytes/nbytes.gyp:nbytes', 'deps/nbytes/nbytes.gyp:nbytes',
'deps/simdutf/simdutf.gyp:simdutf',
], ],
'includes': [ 'includes': [

4
node.gypi
View File

@ -220,6 +220,10 @@
'dependencies': [ 'deps/simdjson/simdjson.gyp:simdjson' ], 'dependencies': [ 'deps/simdjson/simdjson.gyp:simdjson' ],
}], }],
[ 'node_shared_simdutf=="false"', {
'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf' ],
}],
[ 'node_shared_brotli=="false"', { [ 'node_shared_brotli=="false"', {
'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ], 'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ],
}], }],