If a file named .default-CFLAGS exists in the build dir, use its contents as the...

FossilOrigin-Name: 731d333c224e70190dadd214de1970ea541a3d716d1d7ff2c0ef6c63b8be9b13

diff --git a/auto.def b/auto.def
index 47ea017a4856061faca87401898489318472601e..c29ef86337ea181d9e70ff4e64d1459b9bda67f4 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -194,7 +194,7 @@ set flags {
   # <developer>
   test-status          => {Enable status of tests}
   gcov=0               => {Enable coverage testing using gcov}
-  linemacros           => {Enable #line macros in the amalgamation.}
+  linemacros           => {Enable #line macros in the amalgamation}
   dump-defines=0       => {Dump autosetup defines to $DUMP_DEFINES_TXT (for build debugging)}
   # </developer>
 
@@ -307,7 +307,12 @@ if {"" eq [proj-bin-define install]} {
 # compiling binaries for the target system (CC a.k.a. $(T.cc)).
 # Normally they're the same, but they will differ when
 # cross-compiling.
-define CFLAGS [get-env CFLAGS {-g -O2}]
+set defaultCFlags {-g -O2}
+if {[file exists .default-CFLAGS]} {
+  set defaultCFlags [proj-file-content .default-CFLAGS]
+}
+define CFLAGS [get-env CFLAGS $defaultCFlags]
+unset defaultCFlags
 define BUILD_CFLAGS [get-env BUILD_CFLAGS {-g}]
 
 ########################################################################

diff --git a/manifest b/manifest
index 3ba8a1be7068d0836be0e99b98e4aec902464225..4561e24b6649c59532c772f8692fc687f23b7ff2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\s--with-wasi-sdk\sis\sactive,\stemporarily\sswap\sCC\sand\sCC_FOR_BUILD\sfor\spurposes\sof\slooking\sfor\sAPIs\srequired\sby\sB.cc.
-D 2024-10-31T06:38:30.018
+C If\sa\sfile\snamed\s.default-CFLAGS\sexists\sin\sthe\sbuild\sdir,\suse\sits\scontents\sas\sthe\sdefault\svalue\sof\sthe\sCFLAGS\sunless\sit's\soverridden\sby\sbeing\spassed\sin\sor\sin\sthe\senvironment.
+D 2024-10-31T06:52:09.938
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28
@@ -13,7 +13,7 @@ F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
-F auto.def d1e7ea57121be95dce59cd908a72e871c3217664d9a9cd6bcfbefbb602d94f67
+F auto.def 343bcb3fff35742e9916bda3e0d5e786ef26610adb00e4039a1763a81330b6a6
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -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 511774942903277b3d38f28336599667df20f94a8de79746b6c236b827b7ffc6
-R 826bef03c13c186e5e25d69159376b65
+P 435f2ee818d7181551c6860b6bc4db97f82d76b58fd82765a6cf49e2d02ff18c
+R 2b5ed1184d3543a78b203dd5ec51e348
 U stephan
-Z 31d99618f66414cd664007258185ba71
+Z 9c24c680b13f0a8ab7e6d4fbe6464cec
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a76ab71634abbadc02618e8962be19a751d4eeb5..be045af54b768bedb5d790ee1b1b4a3675c4601a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-435f2ee818d7181551c6860b6bc4db97f82d76b58fd82765a6cf49e2d02ff18c
+731d333c224e70190dadd214de1970ea541a3d716d1d7ff2c0ef6c63b8be9b13