Skip to content

Commit

Permalink
build: conditionally compile bundled simdutf
Browse files Browse the repository at this point in the history
The --shared-simdutf flag was introduced in nodejs#52924, but the
implementation was incomplete.

Resolves nodejs#52914
  • Loading branch information
jirutka committed Nov 16, 2024
1 parent 9d518ed commit e12c6ef
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
10 changes: 4 additions & 6 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,6 @@
'dependencies': [
'deps/googletest/googletest.gyp:gtest_prod',
'deps/histogram/histogram.gyp:histogram',
'deps/simdutf/simdutf.gyp:simdutf',
'deps/nbytes/nbytes.gyp:nbytes',
'node_js2c#host',
],
Expand Down Expand Up @@ -1169,7 +1168,6 @@
'deps/googletest/googletest.gyp:gtest',
'deps/googletest/googletest.gyp:gtest_main',
'deps/histogram/histogram.gyp:histogram',
'deps/simdutf/simdutf.gyp:simdutf',
'deps/nbytes/nbytes.gyp:nbytes',
],

Expand Down Expand Up @@ -1321,9 +1319,7 @@
'target_name': 'node_js2c',
'type': 'executable',
'toolsets': ['host'],
'dependencies': [
'deps/simdutf/simdutf.gyp:simdutf#host',
],
'dependencies': [],
'include_dirs': [
'tools',
'src',
Expand All @@ -1336,6 +1332,9 @@
],
'conditions': [
[ 'node_shared_libuv=="false"', {
'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf#host' ],
}],
[ 'node_shared_simdutf=="false"', {
'dependencies': [ 'deps/uv/uv.gyp:libuv#host' ],
}],
[ 'OS in "linux mac"', {
Expand All @@ -1361,7 +1360,6 @@
'<(node_lib_target_name)',
'deps/histogram/histogram.gyp:histogram',
'deps/nbytes/nbytes.gyp:nbytes',
'deps/simdutf/simdutf.gyp:simdutf',
],

'includes': [
Expand Down
4 changes: 4 additions & 0 deletions node.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,10 @@
'dependencies': [ 'deps/simdjson/simdjson.gyp:simdjson' ],
}],

[ 'node_shared_simdutf=="false"', {
'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf' ],
}],

[ 'node_shared_brotli=="false"', {
'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ],
}],
Expand Down

0 comments on commit e12c6ef

Please sign in to comment.