Skip to content

Commit fffabca

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 d8eb83c commit fffabca

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
@@ -849,7 +849,6 @@
849849
'dependencies': [
850850
'deps/googletest/googletest.gyp:gtest_prod',
851851
'deps/histogram/histogram.gyp:histogram',
852-
'deps/simdutf/simdutf.gyp:simdutf',
853852
'deps/nbytes/nbytes.gyp:nbytes',
854853
'node_js2c#host',
855854
],
@@ -1170,7 +1169,6 @@
11701169
'deps/googletest/googletest.gyp:gtest',
11711170
'deps/googletest/googletest.gyp:gtest_main',
11721171
'deps/histogram/histogram.gyp:histogram',
1173-
'deps/simdutf/simdutf.gyp:simdutf',
11741172
'deps/nbytes/nbytes.gyp:nbytes',
11751173
],
11761174

@@ -1322,9 +1320,6 @@
13221320
'target_name': 'node_js2c',
13231321
'type': 'executable',
13241322
'toolsets': ['host'],
1325-
'dependencies': [
1326-
'deps/simdutf/simdutf.gyp:simdutf#host',
1327-
],
13281323
'include_dirs': [
13291324
'tools',
13301325
'src',
@@ -1336,6 +1331,9 @@
13361331
'src/embedded_data.cc',
13371332
],
13381333
'conditions': [
1334+
[ 'node_shared_simdutf=="false"', {
1335+
'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf#host' ],
1336+
}],
13391337
[ 'node_shared_libuv=="false"', {
13401338
'dependencies': [ 'deps/uv/uv.gyp:libuv#host' ],
13411339
}],
@@ -1362,7 +1360,6 @@
13621360
'<(node_lib_target_name)',
13631361
'deps/histogram/histogram.gyp:histogram',
13641362
'deps/nbytes/nbytes.gyp:nbytes',
1365-
'deps/simdutf/simdutf.gyp:simdutf',
13661363
],
13671364

13681365
'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)