Commit fffabca
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
2 files changed
Lines changed: 7 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -849,7 +849,6 @@ | |||
| 849 | 849 | 'dependencies': [ | |
| 850 | 850 | 'deps/googletest/googletest.gyp:gtest_prod', | |
| 851 | 851 | 'deps/histogram/histogram.gyp:histogram', | |
| 852 | - 'deps/simdutf/simdutf.gyp:simdutf', | ||
| 853 | 852 | 'deps/nbytes/nbytes.gyp:nbytes', | |
| 854 | 853 | 'node_js2c#host', | |
| 855 | 854 | ], | |
@@ -1170,7 +1169,6 @@ | |||
| 1170 | 1169 | 'deps/googletest/googletest.gyp:gtest', | |
| 1171 | 1170 | 'deps/googletest/googletest.gyp:gtest_main', | |
| 1172 | 1171 | 'deps/histogram/histogram.gyp:histogram', | |
| 1173 | - 'deps/simdutf/simdutf.gyp:simdutf', | ||
| 1174 | 1172 | 'deps/nbytes/nbytes.gyp:nbytes', | |
| 1175 | 1173 | ], | |
| 1176 | 1174 | ||
@@ -1322,9 +1320,6 @@ | |||
| 1322 | 1320 | 'target_name': 'node_js2c', | |
| 1323 | 1321 | 'type': 'executable', | |
| 1324 | 1322 | 'toolsets': ['host'], | |
| 1325 | - 'dependencies': [ | ||
| 1326 | - 'deps/simdutf/simdutf.gyp:simdutf#host', | ||
| 1327 | - ], | ||
| 1328 | 1323 | 'include_dirs': [ | |
| 1329 | 1324 | 'tools', | |
| 1330 | 1325 | 'src', | |
@@ -1336,6 +1331,9 @@ | |||
| 1336 | 1331 | 'src/embedded_data.cc', | |
| 1337 | 1332 | ], | |
| 1338 | 1333 | 'conditions': [ | |
| 1334 | + [ 'node_shared_simdutf=="false"', { | ||
| 1335 | + 'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf#host' ], | ||
| 1336 | + }], | ||
| 1339 | 1337 | [ 'node_shared_libuv=="false"', { | |
| 1340 | 1338 | 'dependencies': [ 'deps/uv/uv.gyp:libuv#host' ], | |
| 1341 | 1339 | }], | |
@@ -1362,7 +1360,6 @@ | |||
| 1362 | 1360 | '<(node_lib_target_name)', | |
| 1363 | 1361 | 'deps/histogram/histogram.gyp:histogram', | |
| 1364 | 1362 | 'deps/nbytes/nbytes.gyp:nbytes', | |
| 1365 | - 'deps/simdutf/simdutf.gyp:simdutf', | ||
| 1366 | 1363 | ], | |
| 1367 | 1364 | ||
| 1368 | 1365 | 'includes': [ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -220,6 +220,10 @@ | |||
| 220 | 220 | 'dependencies': [ 'deps/simdjson/simdjson.gyp:simdjson' ], | |
| 221 | 221 | }], | |
| 222 | 222 | ||
| 223 | + [ 'node_shared_simdutf=="false"', { | ||
| 224 | + 'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf' ], | ||
| 225 | + }], | ||
| 226 | + | ||
| 223 | 227 | [ 'node_shared_brotli=="false"', { | |
| 224 | 228 | 'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ], | |
| 225 | 229 | }], | |
0 commit comments