From 1e38a9cc1af73b2ee811f750c8f59e7d48b5b75c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 22 Oct 2024 03:56:21 +0000
Subject: [PATCH] After discussing [4d4423df8d14] with Steve Bennett, do not
 prepend $prefix/bin to the search path for binaries, as that path is commonly
 used for cross-compiled targets and we want binaries which will run on the
 build host.

FossilOrigin-Name: f2008a7d797263de25eaed60d4b6bd5c87cdb917bb92cfc8700f91e6416d744c
---
 auto.def                   |  3 ++-
 autosetup/hwaci-common.tcl | 33 ++++++++++++---------------------
 manifest                   | 14 +++++++-------
 manifest.uuid              |  2 +-
 4 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/auto.def b/auto.def
index cfe4e6dcae..43cfb5f753 100644
--- a/auto.def
+++ b/auto.def
@@ -454,7 +454,7 @@ proc hwaci-check-tcl {} {
       hwaci-fatal "TCL shell $with_tclsh is not executable"
     } else {
       define TCLSH_CMD $with_tclsh
-      puts "Using tclsh at \"$with_tclsh\""
+      puts "Using tclsh: $with_tclsh"
     }
     if {$use_tcl} {
       if {[catch {exec $with_tclsh $top_srcdir/tool/find_tclconfig.tcl} result] == 0} {
@@ -510,6 +510,7 @@ proc hwaci-check-tcl {} {
         }
       }
     }
+    puts "Using tclConfig.sh: $cfg"
   } elseif {!$optTcl} {
     puts "Unable to run tests because of --disable-tcl"
   } else {
diff --git a/autosetup/hwaci-common.tcl b/autosetup/hwaci-common.tcl
index bc4e214fb8..0729abacf0 100644
--- a/autosetup/hwaci-common.tcl
+++ b/autosetup/hwaci-common.tcl
@@ -94,24 +94,22 @@ proc hwaci-check-function-in-lib {function libs {otherlibs {}}} {
 #}
 
 ########################################################################
-# Works similarly to autosetup's [find-executable-path $binName] but
-# first checks for [get-define prefix]/bin/$binName. Returns the full
-# path to the result or an empty string. If the first argument is -v
-# then it emits info about its status, otherwise it works silently.
+# Usage: hwaci-find-executable-path ?-v? binaryName
+#
+# Works similarly to autosetup's [find-executable-path $binName] but:
+#
+# - If the first arg is -v, it's verbose about searching, else it's quiet.
+#
+# Returns the full path to the result or an empty string.
 proc hwaci-find-executable-path {args} {
   set binName $args
   set verbose 0
   if {[lindex $args 0] eq "-v"} {
     set verbose 1
     set binName [lrange $args 1 end]
-  }
-  if {$verbose} {
     msg-checking "Looking for $binName ... "
   }
-  set check [get-define prefix]/bin/$binName
-  if {"" eq $check || ![file-isexec $check]} {
-    set check [find-executable-path $binName]
-  }
+  set check [find-executable-path $binName]
   if {$verbose} {
     if {"" eq $check} {
       msg-result "not found"
@@ -140,25 +138,18 @@ proc hwaci-bin-define {binName {defName {}}} {
 }
 
 ########################################################################
+# Usage: hwaci-first-bin-of bin...
+#
 # Looks for the first binary found of the names passed to this
-# function. It first looks in [get-define prefix]/bin, then falls back
-# to [cc-path-progs]. If a match is found, the full path to that
-# binary is returned, else "" is returned.
+# function.  If a match is found, the full path to that binary is
+# returned, else "" is returned.
 #
 # Despite using cc-path-progs to do the search, this function clears
 # any define'd name that function stores for the result (because the
 # caller has no sensible way of knowing which result it was unless
 # they pass only a single argument).
 proc hwaci-first-bin-of {args} {
-  set p [get-define prefix]/bin
   foreach b $args {
-    set pb $p/$b
-    msg-checking "Checking for $pb ... "
-    if {[file-isexec $pb]} {
-      msg-result yes
-      return $pb
-    }
-    msg-result no
     if {[cc-path-progs $b]} {
       set u [string toupper $b]
       set x [get-define $u]
diff --git a/manifest b/manifest
index cfff6aedc3..fdea4ff68f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Touch\sconfigure-generated\sfiles\sat\sconfigure-time\seven\sif\sautosetup\sdoes\snot\supdate\sthem\sbecause\stheir\scontents\swould\snot\sbe\schanged.\sWorks\saround\swonky\sdeps\scausing\stoo-frequent\srebuilds.
-D 2024-10-22T03:33:11.322
+C After\sdiscussing\s[4d4423df8d14]\swith\sSteve\sBennett,\sdo\snot\sprepend\s$prefix/bin\sto\sthe\ssearch\spath\sfor\sbinaries,\sas\sthat\spath\sis\scommonly\sused\sfor\scross-compiled\stargets\sand\swe\swant\sbinaries\swhich\swill\srun\son\sthe\sbuild\shost.
+D 2024-10-22T03:56:21.378
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -14,7 +14,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 f09183abc026e18248b6ea08ff6729534c9085593e1792242b85d117e17d21a2
+F auto.def 8bdc3871a7acb7091841aacc7dee8131f2e529c8fdb09b939085adc846fee144
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -48,7 +48,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 35741010b16e295831b9f0509eefabde296393077dcdfbacfac08664024a571b
+F autosetup/hwaci-common.tcl e2a8a47eae0540179922cebc71c8f89a9dd57e1fbd87baa608d1ef68c84f79b8
 F autosetup/jimsh0.c 1b5fe91fffcddbc29f2b16acb80f1650632ea2edbe8336b8155ef7b4c66f6d8d
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
@@ -2240,8 +2240,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 4d4423df8d14fb683bb89bebeac4b108a40847259a116fcb634b9e6594907026
-R 11d74630845ef40c7f6ed5b9fbaad6cc
+P 339b48af1728f6acb4c3a02f84bd432466dcc728d3d01f9728e82f3c6aedb002
+R 14a9823295475261e592b5a3cbc7b5e0
 U stephan
-Z 563969555f9e1585b74abf0a638fb9ce
+Z da5168a3b869cb4b5385423bf4ef4565
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 86533e1c0d..d6656dcfd8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-339b48af1728f6acb4c3a02f84bd432466dcc728d3d01f9728e82f3c6aedb002
+f2008a7d797263de25eaed60d4b6bd5c87cdb917bb92cfc8700f91e6416d744c
-- 
2.39.5