Wrap some exceptionally long lines in main.mk. Add option to override LDFLAGS on...

FossilOrigin-Name: 073080cae3ea0d12b133d9c9ae98413bb32870a9738c98b89bc345181be81f23

diff --git a/main.mk b/main.mk
index 21dd01cfde4259de230704bee9a46215a0272d70..8cc37ff775c7b1eef3cef555ee44ba47b567d94a 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -1334,7 +1334,8 @@ tclsqlite-stubs.o:        $(T.tcl.env.sh) $(TOP)/src/tclsqlite.c $(DEPS_OBJ_COMMON)
 
 tclsqlite3$(T.exe):    $(T.tcl.env.sh) tclsqlite-shell.o $(libsqlite3.SO)
        $(T.link.tcl) -o $@ tclsqlite-shell.o \
-                $(libsqlite3.SO) $$TCL_INCLUDE_SPEC $$TCL_LIB_SPEC $(LDFLAGS.libsqlite3)
+               $(libsqlite3.SO) $$TCL_INCLUDE_SPEC $$TCL_LIB_SPEC \
+               $(LDFLAGS.libsqlite3)
 tclsqlite3$(T.exe)-1: tclsqlite3$(T.exe)
 tclsqlite3$(T.exe)-0 tclsqlite3$(T.exe)-:
 tcl: tclsqlite3$(T.exe)-$(HAVE_TCL)
@@ -1731,7 +1732,8 @@ sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl \
        $(B.tclsh) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
 
 sqlite3_analyzer$(T.exe): $(T.tcl.env.sh) sqlite3_analyzer.c
-       $(T.link.tcl) sqlite3_analyzer.c -o $@ $$TCL_LIB_SPEC $$TCL_INCLUDE_SPEC $(LDFLAGS.libsqlite3)
+       $(T.link.tcl) sqlite3_analyzer.c -o $@ $$TCL_LIB_SPEC $$TCL_INCLUDE_SPEC \
+               $(LDFLAGS.libsqlite3)
 
 sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl \
             $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl \
@@ -1739,14 +1741,15 @@ sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl \
        $(B.tclsh) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
 
 sqltclsh$(T.exe): $(T.tcl.env.sh) sqltclsh.c
-       $(T.link.tcl) sqltclsh.c -o $@ $$TCL_INCLUDE_SPEC $(CFLAGS.libsqlite3) $$TCL_LIB_SPEC $(LDFLAGS.libsqlite3)
+       $(T.link.tcl) sqltclsh.c -o $@ $$TCL_INCLUDE_SPEC $(CFLAGS.libsqlite3) \
+               $$TCL_LIB_SPEC $(LDFLAGS.libsqlite3)
 # xbin: target for generic binaries which aren't usually built. It is
 # used primarily for testing the build process.
 xbin: sqltclsh$(T.exe) sqlite3_analyzer$(T.exe)
 
 sqlite3_expert$(T.exe): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c \
                        $(TOP)/ext/expert/expert.c sqlite3.c
-       $(T.link)       $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c \
+       $(T.link) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c \
                $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(LDFLAGS.libsqlite3)
 xbin: sqlite3_expert$(T.exe)
 
@@ -1764,16 +1767,17 @@ sqlite3_checker.c:      $(CHECKER_DEPS) has_tclsh85
        $(B.tclsh) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
 
 sqlite3_checker$(T.exe):       $(T.tcl.env.sh) sqlite3_checker.c
-       $(T.link.tcl) sqlite3_checker.c -o $@ $$TCL_INCLUDE_SPEC $(CFLAGS.libsqlite3) $$TCL_LIB_SPEC $(LDFLAGS.libsqlite3)
+       $(T.link.tcl) sqlite3_checker.c -o $@ $$TCL_INCLUDE_SPEC \
+               $(CFLAGS.libsqlite3) $$TCL_LIB_SPEC $(LDFLAGS.libsqlite3)
 xbin: sqlite3_checker$(T.exe)
 
 dbdump$(T.exe): $(TOP)/ext/misc/dbdump.c sqlite3.o
        $(T.link) -DDBDUMP_STANDALONE -o $@ \
-           $(TOP)/ext/misc/dbdump.c sqlite3.o $(LDFLAGS.libsqlite3)
+               $(TOP)/ext/misc/dbdump.c sqlite3.o $(LDFLAGS.libsqlite3)
 xbin: dbdump$(T.exe)
 
 dbtotxt$(T.exe): $(TOP)/tool/dbtotxt.c
-       $(T.link)-o $@ $(TOP)/tool/dbtotxt.c
+       $(T.link)-o $@ $(TOP)/tool/dbtotxt.c $(LDFLAGS.configure)
 xbin: dbtotxt$(T.exe)
 
 showdb$(T.exe):        $(TOP)/tool/showdb.c sqlite3.o
@@ -1793,20 +1797,23 @@ showwal$(T.exe):        $(TOP)/tool/showwal.c sqlite3.o
 xbin: showwal$(T.exe)
 
 showshm$(T.exe):       $(TOP)/tool/showshm.c
-       $(T.link) -o $@ $(TOP)/tool/showshm.c
+       $(T.link) -o $@ $(TOP)/tool/showshm.c $(LDFLAGS.configure)
 xbin: showshm$(T.exe)
 
 index_usage$(T.exe): $(TOP)/tool/index_usage.c sqlite3.o
-       $(T.link) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.o $(LDFLAGS.libsqlite3)
+       $(T.link) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.o \
+               $(LDFLAGS.libsqlite3)
 xbin: index_usage$(T.exe)
 
 # Reminder: changeset does not build without -DSQLITE_ENABLE_SESSION
 changeset$(T.exe):     $(TOP)/ext/session/changeset.c sqlite3.o
-       $(T.link) -o $@ $(TOP)/ext/session/changeset.c sqlite3.o $(LDFLAGS.libsqlite3)
+       $(T.link) -o $@ $(TOP)/ext/session/changeset.c sqlite3.o \
+               $(LDFLAGS.libsqlite3)
 xbin: changeset$(T.exe)
 
 changesetfuzz$(T.exe): $(TOP)/ext/session/changesetfuzz.c sqlite3.o
-       $(T.link) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.o $(LDFLAGS.libsqlite3)
+       $(T.link) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.o \
+               $(LDFLAGS.libsqlite3)
 xbin: changesetfuzz$(T.exe)
 
 rollback-test$(T.exe): $(TOP)/tool/rollback-test.c sqlite3.o
@@ -1818,7 +1825,7 @@ atrc$(T.exe): $(TOP)/test/atrc.c sqlite3.o
 xbin: atrc$(T.exe)
 
 LogEst$(T.exe):        $(TOP)/tool/logest.c sqlite3.h
-       $(T.link) -I. -o $@ $(TOP)/tool/logest.c
+       $(T.link) -I. -o $@ $(TOP)/tool/logest.c $(LDFLAGS.configure)
 xbin: LogEst$(T.exe)
 
 wordcount$(T.exe):     $(TOP)/test/wordcount.c sqlite3.o
@@ -1826,17 +1833,20 @@ wordcount$(T.exe):      $(TOP)/test/wordcount.c sqlite3.o
 xbin: wordcount$(T.exe)
 
 speedtest1$(T.exe):    $(TOP)/test/speedtest1.c sqlite3.c Makefile
-       $(T.link) $(ST_OPT) -o $@ $(TOP)/test/speedtest1.c sqlite3.c $(LDFLAGS.libsqlite3)
+       $(T.link) $(ST_OPT) -o $@ $(TOP)/test/speedtest1.c sqlite3.c \
+               $(LDFLAGS.libsqlite3)
 xbin: speedtest1$(T.exe)
 
 startup$(T.exe):       $(TOP)/test/startup.c sqlite3.c
-       $(T.link) -Os -g -USQLITE_THREADSAFE -DSQLITE_THREADSAFE=0 -o $@ $(TOP)/test/startup.c sqlite3.c $(LDFLAGS.libsqlite3)
+       $(T.link) -Os -g -USQLITE_THREADSAFE -DSQLITE_THREADSAFE=0 \
+               -o $@ $(TOP)/test/startup.c sqlite3.c $(LDFLAGS.libsqlite3)
 xbin: startup$(T.exe)
 
 KV_OPT += -DSQLITE_DIRECT_OVERFLOW_READ
 
 kvtest$(T.exe):        $(TOP)/test/kvtest.c sqlite3.c
-       $(T.link) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(LDFLAGS.libsqlite3)
+       $(T.link) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c \
+               $(LDFLAGS.libsqlite3)
 xbin: kvtest$(T.exe)
 
 #
@@ -1847,7 +1857,8 @@ rbu$(T.exe): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.o
        $(T.link) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.o $(LDFLAGS.libsqlite3)
 
 loadfts$(T.exe): $(TOP)/tool/loadfts.c $(libsqlite3.LIB)
-       $(T.link) $(TOP)/tool/loadfts.c $(libsqlite3.LIB) -o $@ $(LDFLAGS.libsqlite3)
+       $(T.link) $(TOP)/tool/loadfts.c $(libsqlite3.LIB) \
+               -o $@ $(LDFLAGS.libsqlite3)
 xbin: loadfts$(T.exe)
 
 # This target will fail if the SQLite amalgamation contains any exported
@@ -1893,7 +1904,8 @@ THREADTEST3_SRC = $(TOP)/test/threadtest3.c    \
                   $(TOP)/test/tt3_lookaside1.c
 
 threadtest3$(T.exe): sqlite3.o $(THREADTEST3_SRC)
-       $(T.link) $(TOP)/test/threadtest3.c $(TOP)/src/test_multiplex.c sqlite3.o -o $@ $(LDFLAGS.libsqlite3)
+       $(T.link) $(TOP)/test/threadtest3.c $(TOP)/src/test_multiplex.c sqlite3.o \
+               -o $@ $(LDFLAGS.libsqlite3)
 xbin: threadtest3$(T.exe)
 
 threadtest: threadtest3$(T.exe)
@@ -1983,7 +1995,7 @@ verify-source:    ./src-verify$(B.exe)
 
 fuzzershell$(T.exe):   $(TOP)/tool/fuzzershell.c sqlite3.c sqlite3.h
        $(T.link) -o $@ $(FUZZERSHELL_OPT) \
-         $(TOP)/tool/fuzzershell.c sqlite3.c $(LDFLAGS.libsqlite3)
+               $(TOP)/tool/fuzzershell.c sqlite3.c $(LDFLAGS.libsqlite3)
 fuzzy: fuzzershell$(T.exe)
 xbin: fuzzershell$(T.exe)
 
@@ -2021,7 +2033,7 @@ run-fuzzcheck:    fuzzcheck$(T.exe) fuzzcheck-asan$(T.exe) fuzzcheck-ubsan$(T.exe)
 
 ossshell$(T.exe):      $(TOP)/test/ossfuzz.c $(TOP)/test/ossshell.c sqlite3.c sqlite3.h
        $(T.link) -o $@ $(FUZZCHECK_OPT) $(TOP)/test/ossshell.c \
-             $(TOP)/test/ossfuzz.c sqlite3.c $(LDFLAGS.libsqlite3)
+               $(TOP)/test/ossfuzz.c sqlite3.c $(LDFLAGS.libsqlite3)
 fuzzy: ossshell$(T.exe)
 xbin: ossshell$(T.exe)
 
@@ -2030,7 +2042,8 @@ sessionfuzz$(T.exe):      $(TOP)/test/sessionfuzz.c sqlite3.c sqlite3.h
 fuzzy: sessionfuzz$(T.exe)
 
 dbfuzz$(T.exe):        $(TOP)/test/dbfuzz.c sqlite3.c sqlite3.h
-       $(T.link) -o $@ $(DBFUZZ_OPT) $(TOP)/test/dbfuzz.c sqlite3.c $(LDFLAGS.libsqlite3)
+       $(T.link) -o $@ $(DBFUZZ_OPT) $(TOP)/test/dbfuzz.c sqlite3.c \
+               $(LDFLAGS.libsqlite3)
 fuzzy: dbfuzz$(T.exe)
 xbin: dbfuzz$(T.exe)
 
@@ -2172,7 +2185,7 @@ sqlite3.def: $(LIBOBJ)
 
 sqlite3.dll: $(LIBOBJ) sqlite3.def
        $(T.cc.sqlite) $(LDFLAGS.shobj) -o $@ sqlite3.def \
-               -Wl,"--strip-all" $(LIBOBJ)
+               -Wl,"--strip-all" $(LIBOBJ) $(LDFLAGS.configure)
 
 #
 # Emit a list of commonly-used targets

diff --git a/manifest b/manifest
index c3003f93eddcac252b55b73d661d0643b4940188..7dd4be8871ff87ced21ba5133deb06839ced4880 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sWin32\sAPIs\sto\sread/write\sthe\sconsole\sin\sWindows\sunless\sthe\nSQLITE_USE_STDIO_FOR_CONSOLE\soption\sis\sdefined.\s\sThis\sis\san\sattempt\sto\sget\nthe\sbuild\sworking\son\sMinGW.
-D 2024-11-11T17:02:29.626
+C Wrap\ssome\sexceptionally\slong\slines\sin\smain.mk.\sAdd\soption\sto\soverride\sLDFLAGS\son\sthe\ssqlite3.dll\starget.\sAudit:\sall\stargets\sfor\swhich\sit\sis\shypothetically\srelevant\scan\snow\sinherit\suser-supplied\sLDFLAGS,\sbut\sonly\sthose\sprovided\sto\sthe\sconfigure\sscript,\snot\sat\smake-time,\sin\sorder\sto\smimic\sthe\shistorical\sbuild's\srestriction\sin\sthat\sregard.
+D 2024-11-11T18:15:50.014
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -696,7 +696,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
 F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b503bef35
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk efb8f627c5793126ff7a86d698676f4e6509a296b0b113ec284e6f723561f0bc
+F main.mk cd92df46e074ce11466d43530cfe23cef48ac541aee4714181369e3fe92df05a
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2198,8 +2198,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P b81976c520fbad0bbdbbb877fe85691bcda25c12cf5597cfe224fb6306cd65b3
-R 7eaee2fd29a0a62fa15ab30f7e1400c5
-U drh
-Z f4fb9c4d51373a0a4c48f856c51e2978
+P abfe488ed67e2e3510c230e656ecf203afa549ebd1d1872442f1fadc97d0817e
+R 24df96c9d99772830356798614acfd48
+U stephan
+Z 28b6529814c584cc2748223194d7bea5
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 663b7cfc6760f928f89b1e846dae9233ed72ce39..24c1159da9d39a878c5bd575cb82a0e8f0e41828 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-abfe488ed67e2e3510c230e656ecf203afa549ebd1d1872442f1fadc97d0817e
+073080cae3ea0d12b133d9c9ae98413bb32870a9738c98b89bc345181be81f23