Skip to content

Commit f557c0e

Browse files
jirutkaaduh95
authored andcommitted
build: compile bundled simdutf conditionally
The --shared-simdutf flag was introduced in #52924, but the implementation was incomplete. Resolves #52914 PR-URL: #55886 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com>
1 parent e309310 commit f557c0e

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

node.gyp

+3-6
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,6 @@
857857
'dependencies': [
858858
'deps/googletest/googletest.gyp:gtest_prod',
859859
'deps/histogram/histogram.gyp:histogram',
860-
'deps/simdutf/simdutf.gyp:simdutf',
861860
'deps/nbytes/nbytes.gyp:nbytes',
862861
'node_js2c#host',
863862
],
@@ -1179,7 +1178,6 @@
11791178
'deps/googletest/googletest.gyp:gtest',
11801179
'deps/googletest/googletest.gyp:gtest_main',
11811180
'deps/histogram/histogram.gyp:histogram',
1182-
'deps/simdutf/simdutf.gyp:simdutf',
11831181
'deps/nbytes/nbytes.gyp:nbytes',
11841182
],
11851183

@@ -1331,9 +1329,6 @@
13311329
'target_name': 'node_js2c',
13321330
'type': 'executable',
13331331
'toolsets': ['host'],
1334-
'dependencies': [
1335-
'deps/simdutf/simdutf.gyp:simdutf#host',
1336-
],
13371332
'include_dirs': [
13381333
'tools',
13391334
'src',
@@ -1345,6 +1340,9 @@
13451340
'src/embedded_data.cc',
13461341
],
13471342
'conditions': [
1343+
[ 'node_shared_simdutf=="false"', {
1344+
'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf#host' ],
1345+
}],
13481346
[ 'node_shared_libuv=="false"', {
13491347
'dependencies': [ 'deps/uv/uv.gyp:libuv#host' ],
13501348
}],
@@ -1371,7 +1369,6 @@
13711369
'<(node_lib_target_name)',
13721370
'deps/histogram/histogram.gyp:histogram',
13731371
'deps/nbytes/nbytes.gyp:nbytes',
1374-
'deps/simdutf/simdutf.gyp:simdutf',
13751372
],
13761373

13771374
'includes': [

node.gypi

+4
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,10 @@
220220
'dependencies': [ 'deps/simdjson/simdjson.gyp:simdjson' ],
221221
}],
222222

223+
[ 'node_shared_simdutf=="false"', {
224+
'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf' ],
225+
}],
226+
223227
[ 'node_shared_brotli=="false"', {
224228
'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ],
225229
}],

0 commit comments

Comments
 (0)