Adjust Makefile.in to honor the CC environment variable. Add the

"show-variables" target to main.mk, for debugging.

FossilOrigin-Name: e5f1a01f9f574a64e464c66c1b88f76aeea83f0bbe697c53bb63d3592d93e55e

diff --git a/Makefile.in b/Makefile.in
index 7aac5ec02fcbd3d821954081a839a720fb8a727a..1a093c5af6aa41acdebe0bc4880dc2fa4a87a965 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,7 +96,7 @@ AR = @AR@
 AR.flags = cr # TODO? Add a configure test to determine this?
 CC = @CC@
 B.cc = @CC_FOR_BUILD@ @BUILD_CFLAGS@
-T.cc = @CC@
+T.cc = $(CC)
 #
 # CFLAGS is problematic because it is frequently overridden when
 # invoking make, which loses things like -fPIC. So... let's avoid

diff --git a/main.mk b/main.mk
index b82b8130a596745c4f2e6dfce999c646c4a6178c..f05fae83366702dc94841ac9c9cad30166fcf160 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -2148,3 +2148,11 @@ clean:   clean-. tidy
 # Clean up everything.  No exceptions.
 distclean-.:
 distclean:     distclean-. clean
+
+
+# Show important variable settings.
+show-variables:        
+       @echo "CC          = $(CC)"
+       @echo "B.cc        = $(B.cc)"
+       @echo "T.cc        = $(T.cc)"
+       @echo "T.cc.sqlite = $(T.cc.sqlite)"

diff --git a/manifest b/manifest
index e58ae0e7c922704e5e2849b638e291989da64684..5cefd09acc1d56eabdfff177d566448375cf0f21 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Fix\sthe\sCLI\sso\sthat\sit\scan\suse\seither\sthe\scanonical\sAntirez\slinenoise\n(with\sHAVE_LINENOISE=1)\sor\sSteve\sBennett's\senhanced\slinenoise\sthat\sworks\non\sthe\sWin32\sconsole\sas\swell\sas\son\sUnix\s(with\sHAVE_LINENOISE=2).\s\sThe\n./configure\sscript\sdetects\swhich\sone\sto\suse\sand\ssets\sHAVE_LINENOISE\saccordingly.
-D 2024-10-30T14:03:56.112
+C Adjust\sMakefile.in\sto\shonor\sthe\sCC\senvironment\svariable.\s\sAdd\sthe\n"show-variables"\starget\sto\smain.mk,\sfor\sdebugging.
+D 2024-10-30T19:13:07.641
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28
-F Makefile.in c938c6f4febb0c5d63870bf9f6f8c43e5b20f3e1cfc889460d340add94d40db3
+F Makefile.in 77b49b5a1acb2d5f026dea3f974306fa1be7d99fe0a1917cab313844716461f0
 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
 F Makefile.msc a92237976eb92c5efaa0dd2524746aec12c196e12df8d4dbff9543a4648c3312
 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
@@ -697,7 +697,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 7795769763a5c6b12f76404b03ae568b8d3a0029d854d9b3c1355704c58c8f7a
+F main.mk f53fa37c14bbf1f561f1c1e0cc4108987ad986e6b609bb9040b4a47e8312887c
 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 47157dcf9ec6b52b37578bcd5dc5ace8c36e62c8ca2625c94252c15db784b115
-R 61fb904d4434d51f1a06bd710d4e38ff
+P c0048e4482e9cb9662637899922af9609e7c8fb002a37b71e6181074df7a0dd1
+R 7a0cc20d4b50730c4df041dd5290b33e
 U drh
-Z d06b56d237b61b23e8eb2bfeab607447
+Z 640e6e3c39ea4199b20729a50edbbfbb
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 3ad30b5684251091410447d544828872dac4c4cd..a6b02a414efca2c8ee842d8cd2b06e982cbd4d93 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c0048e4482e9cb9662637899922af9609e7c8fb002a37b71e6181074df7a0dd1
+e5f1a01f9f574a64e464c66c1b88f76aeea83f0bbe697c53bb63d3592d93e55e