From 826fd35242efe9096f8227a458b89258fe83fd4f Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Sat, 16 Nov 2024 19:13:46 +0100 Subject: [PATCH] build: compile bundled simdjson conditionally The --shared-simdjson flag was introduced in #52924, but the implementation was incomplete. Resolves #52914 PR-URL: https://github.com/nodejs/node/pull/55886 Reviewed-By: Yagiz Nizipli Reviewed-By: Luigi Pinca Reviewed-By: Richard Lau --- node.gyp | 3 --- node.gypi | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/node.gyp b/node.gyp index ea8fb85c26e14f..df4cea663ec9bc 100644 --- a/node.gyp +++ b/node.gyp @@ -857,7 +857,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', @@ -1180,7 +1179,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', ], @@ -1373,7 +1371,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', ], diff --git a/node.gypi b/node.gypi index 3646945241c0d9..63710d07f552a1 100644 --- a/node.gypi +++ b/node.gypi @@ -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' ], }],