Fix BUILD_CFLAGS (for B.cc) to not inherent CFLAGS (which are only for T.cc).

FossilOrigin-Name: ffdce13deb8a1fbce717da9ca44fd34409bedad4db805722100647372c06f4f5

diff --git a/auto.def b/auto.def
index b520cfb1e44139d4b84dbecdee1f2c6cd9909e02..8b429f18a22df4590de5699165623857ed053f17 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -333,7 +333,7 @@ if {"" eq [hwaci-bin-define install]} {
 # a.k.a. TCC).  Normally they're the same, but they will differ when
 # cross-compiling.
 define BUILD_CC [get-define CC_FOR_BUILD]
-define BUILD_CFLAGS [get-env CFLAGS {-g}]
+define BUILD_CFLAGS [get-env BUILD_CFLAGS {-g}]
 define ENABLE_SHARED 1
 define HAVE_TCL 0
 

diff --git a/autosetup/hwaci-common.tcl b/autosetup/hwaci-common.tcl
index 06f3b116456742c85729bfd0aa7bf81895c298b9..a09dedffeae061aff8015bc301fd4bb28d64e0af 100644 (file)
--- a/autosetup/hwaci-common.tcl
+++ b/autosetup/hwaci-common.tcl
@@ -57,12 +57,10 @@ proc hwaci-fatal {msg} {
 }
 
 ########################################################################
-# hwaci-lshift_ shifts $count elements from the list named $listVar and
-# returns them.
+# hwaci-lshift_ shifts $count elements from the list named $listVar
+# and returns them as a new list. On empty input, returns "".
 #
 # Modified slightly from: https://wiki.tcl-lang.org/page/lshift
-#
-# On an empty list, returns "".
 proc hwaci-lshift_ {listVar {count 1}} {
   upvar 1 $listVar l
   if {![info exists l]} {

diff --git a/manifest b/manifest
index edbf21d6eb3b08744d29a45f747e5ac56da3e0a8..40bf020b127b006b14f67489eb5ad0bf59ce6c5b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Experimentally:\swhen\s./configure\sCC=foo\sis\sused\sin\sa\snon-cross-compilation\sbuild\sand\sCC_FOR_BUILD\sis\snot\sexplicitly\sprovided,\sforce\sCC_FOR_BUILD\sto\sdefault\sto\sCC.\sThis\sis\sdebatable\s-\ssee\sthe\scode\scomments\sfor\sthe\sjustification.
-D 2024-10-25T23:03:33.136
+C Fix\sBUILD_CFLAGS\s(for\sB.cc)\sto\snot\sinherent\sCFLAGS\s(which\sare\sonly\sfor\sT.cc).
+D 2024-10-25T23:04:50.934
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md b6e6c1baf38e4339bd3f1e0e5e5bfd0a9a93d133360691b2785c2d4b2f2dcec2
@@ -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 1671569c94900178ab4683928ccf408992a3e512fdd582cb1e52c80b6b05fa07
+F auto.def 91a723897b2f2230fe200e9cbda9e7b4063bc0af42768d6fe0f376b813c80b9b
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -47,7 +47,7 @@ F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795f
 F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
 F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bde14
 F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
-F autosetup/hwaci-common.tcl 97b55f68dd190e624340ced9c2de16286edad9db95fede4a184af4249561b4bb
+F autosetup/hwaci-common.tcl ed34d81dc51e8acc934d2101d9da5ded27ae7ae55a01a00896150bbfc7ca52da
 F autosetup/jimsh0.c 27ea5f221359ef6c58780fc6c185aadbf8d3bee9a021331a3e5de0eba0dc6de6
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
@@ -2237,8 +2237,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2d2f6dfdebbaba181d0ac16b5b0fa63490fb4c4bdb5ee2e8bf70f06ec862a77f
-R 030d93b69f9a5aa6b2998a65b82a419a
+P a49bee68418f9e8c3813a60f76de265b8e6a98a15ab9b246aa42d9e9558a03eb
+R c14c5d9afdf9f83be57f58112a477cbb
 U stephan
-Z 328d6e2939a83c73df030dc650be2125
+Z fa7cc103b1950703dd62a0222c63e168
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 185b16ef2f5ad32a52ac5225abd883391d4598b0..f3078dd72f3dc602e88a7a733a0497b2fb4e9f77 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a49bee68418f9e8c3813a60f76de265b8e6a98a15ab9b246aa42d9e9558a03eb
+ffdce13deb8a1fbce717da9ca44fd34409bedad4db805722100647372c06f4f5