Skip to content

Commit 0e3dcb2

Browse files
committed
chore: try another approach for sqlite build patch
1 parent 7b7cf00 commit 0e3dcb2

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

patches/sqlite_fix_build.patch

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
1-
diff --git a/Makefile.in b/Makefile.in
2-
index 5b17c0e426..095c43b83d 100644
3-
--- a/Makefile.in
4-
+++ b/Makefile.in
5-
@@ -281,7 +281,7 @@ sqlite_cfg.h: $(AS_AUTO_DEF)
6-
# build requires GNU make.
1+
diff --git a/main.mk b/main.mk
2+
index a0b08e5773..1b7620e303 100644
3+
--- a/main.mk
4+
+++ b/main.mk
5+
@@ -1994,9 +1994,9 @@ xbin: threadtest5
6+
# runtime performance hit, which is fine for use in the shell but is
7+
# not appropriate for the canonical library build.
78
#
8-
EMCC_WRAPPER = @EMCC_WRAPPER@
9-
-fiddle: sqlite3.c shell.c
10-
+fiddle: sqlite3.c
11-
@if [ x = "x$(EMCC_WRAPPER)" ]; then \
12-
echo "Emscripten SDK not found by configure. Cannot build fiddle." 1&>2; \
13-
exit 1; \
9+
-sqlite3$(T.exe): shell.c sqlite3.c
10+
+sqlite3$(T.exe): sqlite3.c
11+
$(T.link) -o $@ \
12+
- shell.c sqlite3.c \
13+
+ sqlite3.c \
14+
$(CFLAGS.readline) $(SHELL_OPT) $(CFLAGS.icu) \
15+
$(LDFLAGS.libsqlite3) $(LDFLAGS.readline)
16+
#
17+
@@ -2352,7 +2352,7 @@ distclean: distclean-. clean
18+
19+
20+
# Show important variable settings.
21+
-show-variables:
22+
+show-variables:
23+
@echo "CC = $(CC)"
24+
@echo "B.cc = $(B.cc)"
25+
@echo "T.cc = $(T.cc)"

0 commit comments

Comments
 (0)