From 83e02dc4823300f4efe3c359d34259fdbfbd5074 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Sat, 16 Nov 2024 19:10:58 +0100 Subject: [PATCH] build: compile bundled ada conditionally The --shared-ada 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 | 5 ----- node.gypi | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/node.gyp b/node.gyp index f018e0a34d5782..4dab82602d658b 100644 --- a/node.gyp +++ b/node.gyp @@ -851,7 +851,6 @@ 'deps/histogram/histogram.gyp:histogram', 'deps/simdjson/simdjson.gyp:simdjson', 'deps/simdutf/simdutf.gyp:simdutf', - 'deps/ada/ada.gyp:ada', 'deps/nbytes/nbytes.gyp:nbytes', 'node_js2c#host', ], @@ -1126,7 +1125,6 @@ 'deps/googletest/googletest.gyp:gtest_prod', 'deps/histogram/histogram.gyp:histogram', 'deps/uvwasi/uvwasi.gyp:uvwasi', - 'deps/ada/ada.gyp:ada', 'deps/nbytes/nbytes.gyp:nbytes', ], 'includes': [ @@ -1175,7 +1173,6 @@ 'deps/histogram/histogram.gyp:histogram', 'deps/simdjson/simdjson.gyp:simdjson', 'deps/simdutf/simdutf.gyp:simdutf', - 'deps/ada/ada.gyp:ada', 'deps/nbytes/nbytes.gyp:nbytes', ], @@ -1253,7 +1250,6 @@ 'dependencies': [ '<(node_lib_target_name)', 'deps/histogram/histogram.gyp:histogram', - 'deps/ada/ada.gyp:ada', 'deps/nbytes/nbytes.gyp:nbytes', ], @@ -1367,7 +1363,6 @@ 'dependencies': [ '<(node_lib_target_name)', 'deps/histogram/histogram.gyp:histogram', - 'deps/ada/ada.gyp:ada', 'deps/nbytes/nbytes.gyp:nbytes', 'deps/simdjson/simdjson.gyp:simdjson', 'deps/simdutf/simdutf.gyp:simdutf', diff --git a/node.gypi b/node.gypi index 9c989022a9ad36..3646945241c0d9 100644 --- a/node.gypi +++ b/node.gypi @@ -212,6 +212,10 @@ 'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ], }], + [ 'node_shared_ada=="false"', { + 'dependencies': [ 'deps/ada/ada.gyp:ada' ], + }], + [ 'node_shared_brotli=="false"', { 'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ], }],