Add missing CFLAGS.intree_includes to T.compile.tcl to fix build of tclsqlite3.

FossilOrigin-Name: bb3c6dc126896528328bb9f51a28a1d46d4549e687c93c16f2d164230c6b1684

diff --git a/main.mk b/main.mk
index b09de2a3b3e960929a38589c6064045763dea4b0..b93ba4225c9e664b7d2b98901ad529c65d49cb6c 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -1005,7 +1005,7 @@ T.tcl.env.source = . $(T.tcl.env.sh) || exit $$?
 # and $(T.link) which first invoke $(T.tcl.env.source). Any targets which used them
 # must have a dependency on $(T.tcl.env.sh)
 #
-T.compile.tcl = $(T.tcl.env.source); $(T.compile)
+T.compile.tcl = $(T.tcl.env.source); $(T.compile) $(CFLAGS.intree_includes)
 T.link.tcl = $(T.tcl.env.source); $(T.link)
 
 #
@@ -1322,7 +1322,7 @@ window.o: $(TOP)/src/window.c $(DEPS_OBJ_COMMON)
        $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/window.c
 
 tclsqlite.o:   $(T.tcl.env.sh) $(TOP)/src/tclsqlite.c $(DEPS_OBJ_COMMON)
-       $(T.compile.tcl) -DUSE_TCL_STUBS=1 $$TCL_INCLUDE_SPEC $(CFLAGS.intree_includes) \
+       $(T.compile.tcl) -DUSE_TCL_STUBS=1 $$TCL_INCLUDE_SPEC \
                -c $(TOP)/src/tclsqlite.c
 
 tclsqlite-shell.o:     $(T.tcl.env.sh) $(TOP)/src/tclsqlite.c $(DEPS_OBJ_COMMON)

diff --git a/manifest b/manifest
index 6e36a7492d70a40596829d6e182a9cc987725d69..a6974ff1050899f4c29b4a58f0f37019299cb65a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\sclosely\semulate\sthe\slegacy\sbuild's\shandling\sof\sLDFLAGS,\spermitting\sthem\sto\sbe\spassed\sto\sconfigure\sbut\snot\sto\smake.\sWe\scannot\s100%\senforce\sthat\sbecause\smain.mk\sis\snot\sfiltered\sby\sthe\sconfigure\sscript,\sso\swe\sinstead\sadd\sa\slevel\sof\sindirection\sto\smake\spassing\sof\sLDFLAGS=...\sto\smake\sa\sno-op.
-D 2024-11-08T07:37:12.419
+C Add\smissing\sCFLAGS.intree_includes\sto\sT.compile.tcl\sto\sfix\sbuild\sof\stclsqlite3.
+D 2024-11-08T08:01:56.002
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -699,7 +699,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 e2a20a4612d8e1d1c3ad2e427d089e18f4831efdeab234dfeaa0a014e3a3d81d
+F main.mk 3ab4da6fd1383aa32173e72cc876d4313692e86fbd447e08f6575cfe68c35a40
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2201,8 +2201,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 a5e07e8063ad50f2cf46b6be568717adc9604bd6dbf926a526de43bda2996ad0
-R bf7c848547bcf2bdf4e3ecfac76baab4
+P d1af9f31831dc99a808b916df4d414943f5d56796c8342411ee4a57abfde85e2
+R e7e6b5f1b00f47c5c5fd2d8a0d9c908a
 U stephan
-Z 41894f1532ad89c47f894ee85a9664de
+Z 83a8e5b16a3924a6c0e5c0fa6944ffd4
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 3ffe554d4609973d4b1ec37262ffef9326a65089..8dd270e64b6c2fef692d7bc0790e0737415fea52 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d1af9f31831dc99a808b916df4d414943f5d56796c8342411ee4a57abfde85e2
+bb3c6dc126896528328bb9f51a28a1d46d4549e687c93c16f2d164230c6b1684