From: stephan <stephan@noemail.net>
Date: Sat, 18 Jan 2025 16:05:38 +0000 (+0000)
Subject: When cross-compiling, change the CFLAGS default to exclude -g, per /chat discussion... 
X-Git-Tag: version-3.49.0~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a1fe1d1da294f2b4f48c3212852151bb10688c6;p=thirdparty%2Fsqlite.git

When cross-compiling, change the CFLAGS default to exclude -g, per /chat discussion prompted by [forum:9a67df63eda9925c|forum post 9a67df63eda9925c].

FossilOrigin-Name: 4309da2ca5cb99ea81f3034ae3c5809187c0131d21f9f9469ea0d69c941f393e
---

diff --git a/auto.def b/auto.def
index 8c7599c032..b4a54111b9 100644
--- a/auto.def
+++ b/auto.def
@@ -325,8 +325,18 @@ 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 [proj-get-env CFLAGS {-g -O2}]
+#
+# When cross-compiling we default to not using the -g flag, based on a
+# /chat discussion prompted by
+# https://sqlite.org/forum/forumpost/9a67df63eda9925c
+set defaultCFlags {-O2}
+if {!$isCrossCompiling} {
+  lappend defaultCFlags -g
+}
+define CFLAGS [proj-get-env CFLAGS $defaultCFlags]
+# BUILD_CFLAGS is the CFLAGS for CC_FOR_BUILD.
 define BUILD_CFLAGS [proj-get-env BUILD_CFLAGS {-g}]
+unset defaultCFlags
 
 proj-if-opt-truthy dev {
   # --enable-dev needs to come early so that the downstream tests
@@ -335,6 +345,8 @@ proj-if-opt-truthy dev {
   proj-opt-set debug 1
   proj-opt-set amalgamation 0
   define CFLAGS [get-env CFLAGS {-O0 -g}]
+  # -------------^^^^^^^ intentionally using [get-env] instead of
+  # [proj-get-env] here.
 }
 
 ########################################################################
diff --git a/manifest b/manifest
index e7d438afbf..141c4d0b23 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\srunning\smake\sinstall,\savoid\sthe\s-s\s(strip)\sflag\swhen\scross-compiling,\sas\sit\sonly\sworks\sfor\sthe\sbuild\splatform.\sReported\sin\s[forum:9a67df63eda9925c|forum\spost\s9a67df63eda9925c].
-D 2025-01-18T13:51:01.877
+C When\scross-compiling,\schange\sthe\sCFLAGS\sdefault\sto\sexclude\s-g,\sper\s/chat\sdiscussion\sprompted\sby\s[forum:9a67df63eda9925c|forum\spost\s9a67df63eda9925c].
+D 2025-01-18T16:05:38.256
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -14,7 +14,7 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
-F auto.def b8135ba11ec23857bc76469f8b447c43fcfeecc9c775179107392e18ebe8c740
+F auto.def 20ddd61060516e29cb984d716c451ad6e7e3ebe1d3786ec8f70813fada06eb2f
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -2207,8 +2207,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 0852c57ee2768224af79910e6f26e70a4962651dae0f8b45cbfc847e6707d7bb
-R ed0f0a3d6dea2dbb296ffb05bcf1dd67
+P 230e49c10e3aa6fe9c487a1e026016a8bf97f7e736e7477d5976d987da5e83cf
+R 862143f3cdd830dae6969328bc86fd10
 U stephan
-Z b7991c6ad22e45c5f184f51dda631f10
+Z 5e9420f0d3ea15cbb564de8d4adc7b33
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index dbbf089777..94ceeec9f2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-230e49c10e3aa6fe9c487a1e026016a8bf97f7e736e7477d5976d987da5e83cf
+4309da2ca5cb99ea81f3034ae3c5809187c0131d21f9f9469ea0d69c941f393e