Time for a break.

FossilOrigin-Name: 1d29cd9095595b7b027b90d644dc4767fde0b6f98316c0eb82014b7aad6770d7

auto.def

@@ -11,17 +11,24 @@ if {[get-define host] ne [get-define build]} {
 }
 define cross_compiling ${cross_compiling}
 
-if {0 && $cross_compiling} {
+if {$cross_compiling} {
   # gcc's cross-compiler is named platform-os-vendor-gcc instead of
   # platform-os-vendor-cc. Checking for cc here will find the CC which
   # was already found via (use cc).  Checking for gcc here would be
   # unportable - the client may well have a different cross-compiler.
-  define-push {GCC LD AR} {
-    cc-check-tools gcc ld ar
-    define BIN_host_GCC [get-define GCC]
+  define-push {LD AR} {
+    cc-check-tools ld ar
+    #define BIN_host_GCC [get-define GCC]
     define BIN_host_LD [get-define LD]
     define BIN_host_AR [get-define AR]
   }
+  #define BIN_host_CC [get-define CC]
+}
+#define CC [get-define CC_FOR_BUILD]
+if {![cc-path-progs ld ar]} {
+  # ^^^^ not cc-check-tools because that one resolves cross-compile
+  # binaries when --host=... is set.
+  user-error "Missing required binary"
 }
 
 ########################################################################
@@ -82,7 +89,7 @@ set srcdir $autosetup(srcdir)
 #puts "srcdir = $srcdir"
 set VERSION [readfile $autosetup(srcdir)/VERSION]
 puts "VERSION = $VERSION"
-define PACKAGE_VERSION $VERSION
+define VERSION $VERSION
 #puts "with-wasi-sdk? = [opt-val with-wasi-sdk]"
 #puts "with-debug? = [opt-val with-debug]"
 

autosetup/hwaci-common.tcl

@@ -408,23 +408,29 @@ proc hwaci-looks-like-windows {{key host}} {
 # host and target are Windows-esque (Cygwin, MinGW, MSys). If the
 # build host is then BUILD_EXEEXT is [define]'d to ".exe", else "". If
 # the build target is then TARGET_EXEEXT is [define]'d to ".exe", else
-# "".
+# "". It also sets BUILD_OBJEXT and TARGET_OBJEXT to the conventional
+# file extension for object files: .obj or .o.
 proc hwaci-check-exeext {} {
   msg-checking "Build host is Windows-esque? "
   if {[hwaci-looks-like-windows host]} {
     define BUILD_EXEEXT ".exe"
+    define BUILD_OBJEXT ".obj"
     msg-result yes
   } else {
     define BUILD_EXEEXT ""
+    define BUILD_OBJEXT ".o"
     msg-result no
   }
 
   msg-checking "Build target is Windows-esque? "
   if {[hwaci-looks-like-windows target]} {
     define TARGET_EXEEXT ".exe"
+    define TARGET_OBJEXT ".obj"
     msg-result yes
   } else {
     define TARGET_EXEEXT ""
+    define TARGET_OBJEXT ".o"
+
     msg-result no
   }
 }

manifest

@@ -1,9 +1,9 @@
-C Integrate\sthe\sconfigure-time\sEmscripten\sbits.
-D 2024-09-25T22:13:49.969
+C Time\sfor\sa\sbreak.
+D 2024-09-25T23:09:38.690
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 423f8b90ccb385a96c9f9551d74ab2b678e7a6191bf908c2b44304997804cb63
+F Makefile.in dee85c233bbfcdf21bc843ecec065c650b0a4c677e87af9bdf50cdf3c3179df7
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc e3c4723c27464acc31da4420b808c8d2690180ba2b915897bece0a9d5d2cecf6
 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
@@ -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 25c1a8645d4845bc2970d183be0ac2c9bdf0f05c348fc6705385c17047802bb4
+F auto.def 667c6566a686bab5994d7c52526c33a2ab516199b85766c29e7fc65b128671ea
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -46,7 +46,7 @@ F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795f
 F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
 F autosetup/cc.tcl 1b52de228642c1db5a714d54ca974d723ec8b4092e8c3765d348b625850f7311
 F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
-F autosetup/hwaci-common.tcl c0ff4bb3399f7a55b5dba83ab6f98b68a54952f28ae49c658340b48ea3cd827d
+F autosetup/hwaci-common.tcl 48465634f1fc73ac30ad747e1d1d1ec897f009ce40edf94092575d9851a61846
 F autosetup/jimsh0.c 1b5fe91fffcddbc29f2b16acb80f1650632ea2edbe8336b8155ef7b4c66f6d8d
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
@@ -2233,8 +2233,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 74d12433599e2f189d8d0a44be834651531ac5a215bf42de386053cd00d29162
-R dd47ba23be16ca7a64fc24efb04f8a5b
+P 456125a14454180d608d8f5bc651aa4350958cdd14f4011ef540beb278ca2d51
+R 2167a1dbbb24f998e809942a74a24831
 U stephan
-Z 7445a300c3d8549aa733ba93da0d5f2b
+Z 5237a006f29465dc76d28d429ddf3ad3
 # Remove this line to create a well-formed Fossil manifest.

manifest.uuid

@@ -1 +1 @@
-456125a14454180d608d8f5bc651aa4350958cdd14f4011ef540beb278ca2d51
+1d29cd9095595b7b027b90d644dc4767fde0b6f98316c0eb82014b7aad6770d7