Ensure that extension sources also inherit the debugging-related flags from --debug or --dev.

FossilOrigin-Name: 3e96b772a46638bc25e036de053d620ded3350871ee10e06fd6fe51429934b0d

4 files changed, 21 insertions, 13 deletions

diff --git a/Makefile.in b/Makefile.in
index 3bb66f13f..5a215ec7b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -138,8 +138,6 @@ libsqlite3.DLL.install-rules = @SQLITE_DLL_INSTALL_RULES@
 # -fsanitize flags for the fuzzcheck-asap app
 CFLAGS.fuzzcheck-asan.fsanitize = @CFLAGS_ASAN_FSANITIZE@
 
-T.cc.sqlite = $(T.cc) @TARGET_DEBUG@
-
 #
 # Define -D_HAVE_SQLITE_CONFIG_H so that the code knows it
 # can include the generated sqlite_cfg.h.
@@ -147,7 +145,12 @@ T.cc.sqlite = $(T.cc) @TARGET_DEBUG@
 # main.mk will fill out T.cc.sqlite with additional flags common to
 # all builds.
 #
-T.cc.sqlite += -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite
+T.cc.sqlite.extras = -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite
+
+#
+# Intended to either be empty or be set to -g -DSQLITE_DEBUG=1.
+#
+T.cc.TARGET_DEBUG = @TARGET_DEBUG@
 
 #
 # $(JIMSH) and $(CFLAGS.jimsh) are documented in main.mk.  $(JIMSH)
diff --git a/main.mk b/main.mk
index 308a8c107..518e06566 100644
--- a/main.mk
+++ b/main.mk
@@ -371,12 +371,17 @@ INSTALL.noexec = $(INSTALL) -m 0644
 T.compile = $(T.cc) $(T.compile.extras)
 
 #
+# Optionally set by the configure script to include -DSQLITE_DEBUG=1
+#
+T.cc.TARGET_DEBUG ?=
+
+#
 # $(T.cc.sqlite) is $(T.cc) plus any flags which are desired for the
 # library as a whole, but not necessarily needed for every binary. It
 # will normally get initially populated with flags by the
 # configure-generated makefile.
 #
-T.cc.sqlite ?= $(T.cc)
+T.cc.sqlite ?= $(T.cc) $(T.cc.sqlite.extras) $(T.cc.TARGET_DEBUG)
 
 #
 # $(CFLAGS.intree_includes) = -I... flags relevant specifically to
@@ -392,7 +397,7 @@ T.cc.sqlite += $(CFLAGS.intree_includes)
 #
 # $(T.cc.extension) = compiler invocation for loadable extensions.
 #
-T.cc.extension = $(T.compile) -I. -I$(TOP)/src -DSQLITE_CORE
+T.cc.extension = $(T.compile) -I. -I$(TOP)/src $(T.cc.TARGET_DEBUG) -DSQLITE_CORE
 
 #
 # $(T.link) = compiler invocation for when the target will be an
diff --git a/manifest b/manifest
index d704f1c97..c14ffe844 100644
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C Correct\sthe\sordering\sof\sthe\sconfigure\sscript's\shandling\sof\sthe\s--dev\sand\s--debug\sflags\sso\sthat\s--dev's\sforcing\sof\s--debug\sget\spicked\sup\searly\senough.
-D 2025-03-31T10:29:06.584
+C Ensure\sthat\sextension\ssources\salso\sinherit\sthe\sdebugging-related\sflags\sfrom\s--debug\sor\s--dev.
+D 2025-03-31T10:54:09.382
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
-F Makefile.in 86cc5297495fd5ce632cd7ec298c562900f874eef42c44d5890bd22397bb3820
+F Makefile.in 34794659ddf442225267c4c9b743b7817d2321be88d5eb44d87f35443dc284b6
 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
 F Makefile.msc bb2cc6f75bbcb2d690fbdd1489914a2febd5e99bad9c77538cb3330d304694c6
 F README.md a953c0cffd6e4f2501a306c00ee2b6e1e6630c25031e094629307fe99dd003d1
@@ -709,7 +709,7 @@ F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36
 F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61
 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk d8badf4236a5f134304e02706a35cee155ad0fb11d850ae7c891146d9b48132f
+F main.mk c35bf589abc5baa7dc4bc44d7f666b82bbc6891fa67486c95d942af9343870b5
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2216,8 +2216,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 67dbd9ff0f1e69e429cf3afaf19b84e8e95fc75035ac90cd0ae78d0d002980f8
-R 88171bb4b0f60222891519af72ef3acb
+P e48189ed33fa9d02b23c18255c7b4c6cab2a6d4b62f7c1edbb0a58ab329735fc
+R 900351079f392a3dac0ffc6765fe20f2
 U stephan
-Z 590d07e8541009009c9ac51eaddb4d9e
+Z 4c01788cf2ee043c6a538c02c303b015
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d93a2169a..3e231d651 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e48189ed33fa9d02b23c18255c7b4c6cab2a6d4b62f7c1edbb0a58ab329735fc
+3e96b772a46638bc25e036de053d620ded3350871ee10e06fd6fe51429934b0d