From: stephan Date: Tue, 22 Oct 2024 13:02:48 +0000 (+0000) Subject: Minor cleanups to how configure generates tool/emcc.sh. X-Git-Tag: major-relase~351^2~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f72770b3462f60c74f5f674bed39338489a1aa8;p=thirdparty%2Fsqlite.git Minor cleanups to how configure generates tool/emcc.sh. FossilOrigin-Name: 4484b4623684b09df018f85d95a2b2894a13f38013902831be20a263db605001 --- diff --git a/auto.def b/auto.def index 0b1a48e934..890a767bd7 100644 --- a/auto.def +++ b/auto.def @@ -838,16 +838,16 @@ define cross_compiling ${cross_compiling} ######################################################################## # Emscripten SDK for building the web-based wasm components. # +set emccsh $srcdir/tool/emcc.sh if {![get-define HAVE_WASI_SDK] && [hwaci-check-emsdk]} { - set wrapper $srcdir/tool/emcc.sh - define EMCC_WRAPPER $wrapper - hwaci-make-from-dot-in $wrapper - catch {exec chmod u+x $wrapper} - unset wrapper + define EMCC_WRAPPER $emccsh + hwaci-make-from-dot-in $emccsh + catch {exec chmod u+x $emccsh} } else { define EMCC_WRAPPER "" - catch {exec rm -f $srcdir/tool/emcc.sh} + catch {file delete -force $emccsh} } +unset emccsh ######################################################################## # Check for log(3) in libm and die with an error if it is not diff --git a/manifest b/manifest index 87c9f44a67..5904c03a3e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Teach\sext/wasm/GNUmakefile\sto\suse\stool/emcc.sh\sand\sfix\sa\ssyntax\serror\sin\stool/emcc.sh.in.\sWork\saround\sa\sJimTCL\sincompatibility\sin\stool/mkshellc.tcl. -D 2024-10-22T12:56:00.929 +C Minor\scleanups\sto\show\sconfigure\sgenerates\stool/emcc.sh. +D 2024-10-22T13:02:48.260 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 2539fa219ed9689601fa1568f0ebe09de028c1916e1dcba154f2b906bbeadc63 +F auto.def 161d52a60891a6d17beca0ad79838d6dbbff6b1cfb079dc1afc1b6ae25ef031c 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 f2008a7d797263de25eaed60d4b6bd5c87cdb917bb92cfc8700f91e6416d744c -R 82fed5141642968aff8ff825cd13834f +P 24e0f6ecc67615a2a8c2df08aa47a782cf692fb1a5a59246eab83c0232e78edc +R d8de8f893f2f9d4ef4213358a88a8c4d U stephan -Z ede5ca6f72a35dcc638e3268758ee837 +Z 14f63c9cbf98b7ad4195a656fe3f2aa0 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index a5ccc7bd34..ce7b24f5d9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -24e0f6ecc67615a2a8c2df08aa47a782cf692fb1a5a59246eab83c0232e78edc +4484b4623684b09df018f85d95a2b2894a13f38013902831be20a263db605001