Do not check for Emscripten when doing a --with-wasi-sdk build.

FossilOrigin-Name: 111cff2cf38886ccec11b45db8b891ec84e24d0b61d413b35fd474b51003e8f2

diff --git a/auto.def b/auto.def
index 84c6e0b2ac20f4f37acf28287997ae1857d7e1e7..18b4f49cdf3ed6e51e8986501f52ce746632ac9b 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -230,8 +230,8 @@ if {1} {
   set wasiSdkDir [opt-val with-wasi-sdk] ; # ??? [lindex [opt-val with-wasi-sdk] end]
   #puts "x wasiSdkDir=$wasiSdkDir foo=[lindex [opt-val with-wasi-sdk] end]"
   if {$wasiSdkDir ne ""} {
-    msg-checking "Checking WASI SDK directory \[$wasiSdkDir]... "
-    puts "prefix = [prefix $wasiSdkDir/bin {clang ld}]"
+    puts "Checking WASI SDK directory \[$wasiSdkDir]... "
+    #puts "prefix = [prefix $wasiSdkDir/bin {clang ld}]"
     hwaci-affirm-files-exist -v {*}[prefix "$wasiSdkDir/bin/" {clang wasm-ld}]
     msg-result "Using wasi-sdk clang, disabling: tcl, CLI shell, DLL, loadable extensions, threading"
     define HAVE_WASI_SDK 1
@@ -759,7 +759,7 @@ define cross_compiling ${cross_compiling}
 ########################################################################
 # Emscripten SDK for building the web-based wasm components.
 #
-if {[hwaci-check-emsdk]} {
+if {0 eq [get-define HAVE_WASI_SDK] && [hwaci-check-emsdk]} {
   set wrapper $srcdir/tool/emcc.sh
   define EMCC_WRAPPER $wrapper
   hwaci-make-from-dot-in $wrapper

diff --git a/manifest b/manifest
index d690074f974f196f4fefe68f8e38f9ae154ce7a2..f8cb8729c638e5b57a6ee868cf8c918332d76521 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Generic\sbuild\scleanups\sand\sreorgs.
-D 2024-10-20T01:09:51.225
+C Do\snot\scheck\sfor\sEmscripten\swhen\sdoing\sa\s--with-wasi-sdk\sbuild.
+D 2024-10-20T01:14:54.879
 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 573b50cfefc60cecb28548519ad7105c5af07ae611204d05a842339fc95986d1
+F auto.def 0a2c00810f7de3d92ec7d5b3716bdaa9877993437ba428873322d9c59fc1ec64
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -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 dcf4fc78fb2813d37eb56c358009f1e5225f28a0c85c710c8127db330efaf319
-R 5d187fc41a2a5eefcf1982b38f70e6e6
+P 365a3d71cf9e0be11e7b3e90b6500142619102d8321c1d6f8111f37117a57929
+R ca118f6891ab0e7efdc6f8f4f1170e5b
 U stephan
-Z 98274b66f6dd84bbce9457a00b5c9351
+Z a1d75beedd7dcb8e17ae83d7df54d589
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index cd182c78984cd27f95e8b18446c782ffbea63808..21f885bbf9f21255633256529f766a5751d6122b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-365a3d71cf9e0be11e7b3e90b6500142619102d8321c1d6f8111f37117a57929
+111cff2cf38886ccec11b45db8b891ec84e24d0b61d413b35fd474b51003e8f2