Skip to content

Commit 9fd02bd

Browse files
committed
Revert "fileio needs libsqlite on Windows"
This reverts commit f5024ba. The tool lib sqlite will clash with the sqlite used by APSW when loaded so revert
1 parent f5024ba commit 9fd02bd

1 file changed

Lines changed: 2 additions & 11 deletions

File tree

tools/vend.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ def __post_init__(self):
108108
Extra(
109109
name="fileio",
110110
description="Implements SQL functions readfile() and writefile(), and eponymous virtual type 'fsdir'",
111-
lib_sqlite=True, # only Windows actually needs this but enabled for all platforms for testing
112111
),
113112
# ::TODO:: fossildelta once RBU extension is wrapped
114113
Extra(
@@ -752,22 +751,14 @@ def strip_and_copy(src: str, dest: str):
752751
match extra.type:
753752
case "extension":
754753
# we don't support these for extensions
755-
assert not extra.lib_sqlite_stdio
756-
757-
libraries = [SQLITE_LIB_NAME] if extra.lib_sqlite else None
758-
library_dirs = [str(build_dir)] if extra.lib_sqlite else None
754+
assert not extra.lib_sqlite and not extra.lib_sqlite_stdio
759755

760756
# .so works just fine on macos, but sqlite only looks
761757
# for ,dylib if you don't give the extension
762758
out_name = f"{extra.name}{compiler.shared_lib_extension if sys.platform != 'darwin' else '.dylib'}"
763759
try:
764760
compiler.link_shared_object(
765-
objs,
766-
out_name,
767-
output_dir=str(build_dir),
768-
extra_preargs=link_extra_preargs,
769-
libraries=libraries,
770-
library_dirs=library_dirs
761+
objs, out_name, output_dir=str(build_dir), extra_preargs=link_extra_preargs
771762
)
772763
except Exception as exc:
773764
failed.append((extra, f"Linking as extension {exc_type(exc)} error"))

0 commit comments

Comments
 (0)