Skip to content

Commit

Permalink
build: compile bundled simdjson conditionally
Browse files Browse the repository at this point in the history
The --shared-simdjson 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>
  • Loading branch information
jirutka authored and aduh95 committed Nov 26, 2024
1 parent 83e02dc commit d8eb83c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 0 additions & 3 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/simdjson/simdjson.gyp:simdjson',
'deps/simdutf/simdutf.gyp:simdutf',
'deps/nbytes/nbytes.gyp:nbytes',
'node_js2c#host',
Expand Down Expand Up @@ -1171,7 +1170,6 @@
'deps/googletest/googletest.gyp:gtest',
'deps/googletest/googletest.gyp:gtest_main',
'deps/histogram/histogram.gyp:histogram',
'deps/simdjson/simdjson.gyp:simdjson',
'deps/simdutf/simdutf.gyp:simdutf',
'deps/nbytes/nbytes.gyp:nbytes',
],
Expand Down Expand Up @@ -1364,7 +1362,6 @@
'<(node_lib_target_name)',
'deps/histogram/histogram.gyp:histogram',
'deps/nbytes/nbytes.gyp:nbytes',
'deps/simdjson/simdjson.gyp:simdjson',
'deps/simdutf/simdutf.gyp:simdutf',
],

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

[ 'node_shared_simdjson=="false"', {
'dependencies': [ 'deps/simdjson/simdjson.gyp:simdjson' ],
}],

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

0 comments on commit d8eb83c

Please sign in to comment.