Skip to content

Commit 1015b22

Browse files
jirutkaruyadorno
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 <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com>
1 parent 5bdfde8 commit 1015b22

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

node.gyp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,6 @@
859859
'deps/histogram/histogram.gyp:histogram',
860860
'deps/simdjson/simdjson.gyp:simdjson',
861861
'deps/simdutf/simdutf.gyp:simdutf',
862-
'deps/ada/ada.gyp:ada',
863862
'deps/nbytes/nbytes.gyp:nbytes',
864863
'node_js2c#host',
865864
],
@@ -1135,7 +1134,6 @@
11351134
'deps/googletest/googletest.gyp:gtest_prod',
11361135
'deps/histogram/histogram.gyp:histogram',
11371136
'deps/uvwasi/uvwasi.gyp:uvwasi',
1138-
'deps/ada/ada.gyp:ada',
11391137
'deps/nbytes/nbytes.gyp:nbytes',
11401138
],
11411139
'includes': [
@@ -1184,7 +1182,6 @@
11841182
'deps/histogram/histogram.gyp:histogram',
11851183
'deps/simdjson/simdjson.gyp:simdjson',
11861184
'deps/simdutf/simdutf.gyp:simdutf',
1187-
'deps/ada/ada.gyp:ada',
11881185
'deps/nbytes/nbytes.gyp:nbytes',
11891186
],
11901187

@@ -1262,7 +1259,6 @@
12621259
'dependencies': [
12631260
'<(node_lib_target_name)',
12641261
'deps/histogram/histogram.gyp:histogram',
1265-
'deps/ada/ada.gyp:ada',
12661262
'deps/nbytes/nbytes.gyp:nbytes',
12671263
],
12681264

@@ -1376,7 +1372,6 @@
13761372
'dependencies': [
13771373
'<(node_lib_target_name)',
13781374
'deps/histogram/histogram.gyp:histogram',
1379-
'deps/ada/ada.gyp:ada',
13801375
'deps/nbytes/nbytes.gyp:nbytes',
13811376
'deps/simdjson/simdjson.gyp:simdjson',
13821377
'deps/simdutf/simdutf.gyp:simdutf',

node.gypi

Lines changed: 4 additions & 0 deletions
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)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy