Skip to content

Commit 83e02dc

Browse files
jirutkaaduh95
authored andcommitted
build: compile bundled ada conditionally
The --shared-ada flag was introduced in #52924, but the implementation was incomplete. Resolves #52914 PR-URL: #55886 Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Richard Lau <[email protected]>
1 parent f9d25ed commit 83e02dc

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

node.gyp

-5
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,6 @@
851851
'deps/histogram/histogram.gyp:histogram',
852852
'deps/simdjson/simdjson.gyp:simdjson',
853853
'deps/simdutf/simdutf.gyp:simdutf',
854-
'deps/ada/ada.gyp:ada',
855854
'deps/nbytes/nbytes.gyp:nbytes',
856855
'node_js2c#host',
857856
],
@@ -1126,7 +1125,6 @@
11261125
'deps/googletest/googletest.gyp:gtest_prod',
11271126
'deps/histogram/histogram.gyp:histogram',
11281127
'deps/uvwasi/uvwasi.gyp:uvwasi',
1129-
'deps/ada/ada.gyp:ada',
11301128
'deps/nbytes/nbytes.gyp:nbytes',
11311129
],
11321130
'includes': [
@@ -1175,7 +1173,6 @@
11751173
'deps/histogram/histogram.gyp:histogram',
11761174
'deps/simdjson/simdjson.gyp:simdjson',
11771175
'deps/simdutf/simdutf.gyp:simdutf',
1178-
'deps/ada/ada.gyp:ada',
11791176
'deps/nbytes/nbytes.gyp:nbytes',
11801177
],
11811178

@@ -1253,7 +1250,6 @@
12531250
'dependencies': [
12541251
'<(node_lib_target_name)',
12551252
'deps/histogram/histogram.gyp:histogram',
1256-
'deps/ada/ada.gyp:ada',
12571253
'deps/nbytes/nbytes.gyp:nbytes',
12581254
],
12591255

@@ -1367,7 +1363,6 @@
13671363
'dependencies': [
13681364
'<(node_lib_target_name)',
13691365
'deps/histogram/histogram.gyp:histogram',
1370-
'deps/ada/ada.gyp:ada',
13711366
'deps/nbytes/nbytes.gyp:nbytes',
13721367
'deps/simdjson/simdjson.gyp:simdjson',
13731368
'deps/simdutf/simdutf.gyp:simdutf',

node.gypi

+4
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,10 @@
212212
'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
213213
}],
214214

215+
[ 'node_shared_ada=="false"', {
216+
'dependencies': [ 'deps/ada/ada.gyp:ada' ],
217+
}],
218+
215219
[ 'node_shared_brotli=="false"', {
216220
'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ],
217221
}],

0 commit comments

Comments
 (0)