Skip to content

Commit 32f7d5a

Browse files
richardlauaduh95
authored andcommitted
build: conditionally compile bundled sqlite
Only compile the bundled sqlite in `deps/sqlite` if Node.js was not configured with `--shared-sqlite`. `node.gypi` is already correctly adding the sqlite dependency if `node_shared_sqlite=="false"` so the unconditional entries in `node.gyp` are not necessary. PR-URL: #55409 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com>
1 parent c2b5ebf commit 32f7d5a

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

node.gyp

-13
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,6 @@
849849
'dependencies': [
850850
'deps/googletest/googletest.gyp:gtest_prod',
851851
'deps/histogram/histogram.gyp:histogram',
852-
'deps/sqlite/sqlite.gyp:sqlite',
853852
'deps/simdjson/simdjson.gyp:simdjson',
854853
'deps/simdutf/simdutf.gyp:simdutf',
855854
'deps/ada/ada.gyp:ada',
@@ -1038,7 +1037,6 @@
10381037
'dependencies': [
10391038
'<(node_lib_target_name)',
10401039
'deps/histogram/histogram.gyp:histogram',
1041-
'deps/sqlite/sqlite.gyp:sqlite',
10421040
],
10431041

10441042
'includes': [
@@ -1050,7 +1048,6 @@
10501048
'deps/v8/include',
10511049
'deps/cares/include',
10521050
'deps/uv/include',
1053-
'deps/sqlite',
10541051
'test/cctest',
10551052
],
10561053

@@ -1083,7 +1080,6 @@
10831080
'dependencies': [
10841081
'<(node_lib_target_name)',
10851082
'deps/histogram/histogram.gyp:histogram',
1086-
'deps/sqlite/sqlite.gyp:sqlite',
10871083
'deps/uvwasi/uvwasi.gyp:uvwasi',
10881084
],
10891085
'includes': [
@@ -1094,7 +1090,6 @@
10941090
'tools/msvs/genfiles',
10951091
'deps/v8/include',
10961092
'deps/cares/include',
1097-
'deps/sqlite',
10981093
'deps/uv/include',
10991094
'deps/uvwasi/include',
11001095
'test/cctest',
@@ -1129,7 +1124,6 @@
11291124
'<(node_lib_target_name)',
11301125
'deps/googletest/googletest.gyp:gtest_prod',
11311126
'deps/histogram/histogram.gyp:histogram',
1132-
'deps/sqlite/sqlite.gyp:sqlite',
11331127
'deps/uvwasi/uvwasi.gyp:uvwasi',
11341128
'deps/ada/ada.gyp:ada',
11351129
'deps/nbytes/nbytes.gyp:nbytes',
@@ -1142,7 +1136,6 @@
11421136
'tools/msvs/genfiles',
11431137
'deps/v8/include',
11441138
'deps/cares/include',
1145-
'deps/sqlite',
11461139
'deps/uv/include',
11471140
'deps/uvwasi/include',
11481141
'test/cctest',
@@ -1179,7 +1172,6 @@
11791172
'deps/googletest/googletest.gyp:gtest',
11801173
'deps/googletest/googletest.gyp:gtest_main',
11811174
'deps/histogram/histogram.gyp:histogram',
1182-
'deps/sqlite/sqlite.gyp:sqlite',
11831175
'deps/simdjson/simdjson.gyp:simdjson',
11841176
'deps/simdutf/simdutf.gyp:simdutf',
11851177
'deps/ada/ada.gyp:ada',
@@ -1196,7 +1188,6 @@
11961188
'deps/v8/include',
11971189
'deps/cares/include',
11981190
'deps/uv/include',
1199-
'deps/sqlite',
12001191
'test/cctest',
12011192
],
12021193

@@ -1261,7 +1252,6 @@
12611252
'dependencies': [
12621253
'<(node_lib_target_name)',
12631254
'deps/histogram/histogram.gyp:histogram',
1264-
'deps/sqlite/sqlite.gyp:sqlite',
12651255
'deps/ada/ada.gyp:ada',
12661256
'deps/nbytes/nbytes.gyp:nbytes',
12671257
],
@@ -1277,7 +1267,6 @@
12771267
'deps/v8/include',
12781268
'deps/cares/include',
12791269
'deps/uv/include',
1280-
'deps/sqlite',
12811270
'test/embedding',
12821271
],
12831272

@@ -1377,7 +1366,6 @@
13771366
'dependencies': [
13781367
'<(node_lib_target_name)',
13791368
'deps/histogram/histogram.gyp:histogram',
1380-
'deps/sqlite/sqlite.gyp:sqlite',
13811369
'deps/ada/ada.gyp:ada',
13821370
'deps/nbytes/nbytes.gyp:nbytes',
13831371
'deps/simdjson/simdjson.gyp:simdjson',
@@ -1394,7 +1382,6 @@
13941382
'deps/v8/include',
13951383
'deps/cares/include',
13961384
'deps/uv/include',
1397-
'deps/sqlite',
13981385
],
13991386

14001387
'defines': [ 'NODE_WANT_INTERNALS=1' ],

0 commit comments

Comments
 (0)