Skip to content

Commit 2db11e8

Browse files
committed
build: conditionally compile bundled ada
The --shared-ada flag was introduced in nodejs#52924, but the implementation was incomplete. Resolves nodejs#52914
1 parent 669b692 commit 2db11e8

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
],
@@ -1125,7 +1124,6 @@
11251124
'deps/googletest/googletest.gyp:gtest_prod',
11261125
'deps/histogram/histogram.gyp:histogram',
11271126
'deps/uvwasi/uvwasi.gyp:uvwasi',
1128-
'deps/ada/ada.gyp:ada',
11291127
'deps/nbytes/nbytes.gyp:nbytes',
11301128
],
11311129
'includes': [
@@ -1174,7 +1172,6 @@
11741172
'deps/histogram/histogram.gyp:histogram',
11751173
'deps/simdjson/simdjson.gyp:simdjson',
11761174
'deps/simdutf/simdutf.gyp:simdutf',
1177-
'deps/ada/ada.gyp:ada',
11781175
'deps/nbytes/nbytes.gyp:nbytes',
11791176
],
11801177

@@ -1252,7 +1249,6 @@
12521249
'dependencies': [
12531250
'<(node_lib_target_name)',
12541251
'deps/histogram/histogram.gyp:histogram',
1255-
'deps/ada/ada.gyp:ada',
12561252
'deps/nbytes/nbytes.gyp:nbytes',
12571253
],
12581254

@@ -1366,7 +1362,6 @@
13661362
'dependencies': [
13671363
'<(node_lib_target_name)',
13681364
'deps/histogram/histogram.gyp:histogram',
1369-
'deps/ada/ada.gyp:ada',
13701365
'deps/nbytes/nbytes.gyp:nbytes',
13711366
'deps/simdjson/simdjson.gyp:simdjson',
13721367
'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)