Skip to content

Commit edbbd4a

Browse files
richardlauruyadorno
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 41a2bcd commit edbbd4a

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
@@ -857,7 +857,6 @@
857857
'dependencies': [
858858
'deps/googletest/googletest.gyp:gtest_prod',
859859
'deps/histogram/histogram.gyp:histogram',
860-
'deps/sqlite/sqlite.gyp:sqlite',
861860
'deps/simdjson/simdjson.gyp:simdjson',
862861
'deps/simdutf/simdutf.gyp:simdutf',
863862
'deps/ada/ada.gyp:ada',
@@ -1047,7 +1046,6 @@
10471046
'dependencies': [
10481047
'<(node_lib_target_name)',
10491048
'deps/histogram/histogram.gyp:histogram',
1050-
'deps/sqlite/sqlite.gyp:sqlite',
10511049
],
10521050

10531051
'includes': [
@@ -1059,7 +1057,6 @@
10591057
'deps/v8/include',
10601058
'deps/cares/include',
10611059
'deps/uv/include',
1062-
'deps/sqlite',
10631060
'test/cctest',
10641061
],
10651062

@@ -1092,7 +1089,6 @@
10921089
'dependencies': [
10931090
'<(node_lib_target_name)',
10941091
'deps/histogram/histogram.gyp:histogram',
1095-
'deps/sqlite/sqlite.gyp:sqlite',
10961092
'deps/uvwasi/uvwasi.gyp:uvwasi',
10971093
],
10981094
'includes': [
@@ -1103,7 +1099,6 @@
11031099
'tools/msvs/genfiles',
11041100
'deps/v8/include',
11051101
'deps/cares/include',
1106-
'deps/sqlite',
11071102
'deps/uv/include',
11081103
'deps/uvwasi/include',
11091104
'test/cctest',
@@ -1138,7 +1133,6 @@
11381133
'<(node_lib_target_name)',
11391134
'deps/googletest/googletest.gyp:gtest_prod',
11401135
'deps/histogram/histogram.gyp:histogram',
1141-
'deps/sqlite/sqlite.gyp:sqlite',
11421136
'deps/uvwasi/uvwasi.gyp:uvwasi',
11431137
'deps/ada/ada.gyp:ada',
11441138
'deps/nbytes/nbytes.gyp:nbytes',
@@ -1151,7 +1145,6 @@
11511145
'tools/msvs/genfiles',
11521146
'deps/v8/include',
11531147
'deps/cares/include',
1154-
'deps/sqlite',
11551148
'deps/uv/include',
11561149
'deps/uvwasi/include',
11571150
'test/cctest',
@@ -1188,7 +1181,6 @@
11881181
'deps/googletest/googletest.gyp:gtest',
11891182
'deps/googletest/googletest.gyp:gtest_main',
11901183
'deps/histogram/histogram.gyp:histogram',
1191-
'deps/sqlite/sqlite.gyp:sqlite',
11921184
'deps/simdjson/simdjson.gyp:simdjson',
11931185
'deps/simdutf/simdutf.gyp:simdutf',
11941186
'deps/ada/ada.gyp:ada',
@@ -1205,7 +1197,6 @@
12051197
'deps/v8/include',
12061198
'deps/cares/include',
12071199
'deps/uv/include',
1208-
'deps/sqlite',
12091200
'test/cctest',
12101201
],
12111202

@@ -1270,7 +1261,6 @@
12701261
'dependencies': [
12711262
'<(node_lib_target_name)',
12721263
'deps/histogram/histogram.gyp:histogram',
1273-
'deps/sqlite/sqlite.gyp:sqlite',
12741264
'deps/ada/ada.gyp:ada',
12751265
'deps/nbytes/nbytes.gyp:nbytes',
12761266
],
@@ -1286,7 +1276,6 @@
12861276
'deps/v8/include',
12871277
'deps/cares/include',
12881278
'deps/uv/include',
1289-
'deps/sqlite',
12901279
'test/embedding',
12911280
],
12921281

@@ -1386,7 +1375,6 @@
13861375
'dependencies': [
13871376
'<(node_lib_target_name)',
13881377
'deps/histogram/histogram.gyp:histogram',
1389-
'deps/sqlite/sqlite.gyp:sqlite',
13901378
'deps/ada/ada.gyp:ada',
13911379
'deps/nbytes/nbytes.gyp:nbytes',
13921380
'deps/simdjson/simdjson.gyp:simdjson',
@@ -1403,7 +1391,6 @@
14031391
'deps/v8/include',
14041392
'deps/cares/include',
14051393
'deps/uv/include',
1406-
'deps/sqlite',
14071394
],
14081395

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

0 commit comments

Comments
 (0)