From: stephan Date: Thu, 25 Sep 2025 14:44:03 +0000 (+0000) Subject: Remove some superfluous tabs and add the mkwasmbuilds ability to emit just its prologue. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5dbbbf4923a0fe92d4b5bddd4ad91a895b88de94;p=thirdparty%2Fsqlite.git Remove some superfluous tabs and add the mkwasmbuilds ability to emit just its prologue. FossilOrigin-Name: 75079401753778e3bc2f7fa307de9217e8d1ec395079fc1009060f707be32943 --- diff --git a/ext/wasm/mkwasmbuilds.c b/ext/wasm/mkwasmbuilds.c index aac34b2a90..6a44386d41 100644 --- a/ext/wasm/mkwasmbuilds.c +++ b/ext/wasm/mkwasmbuilds.c @@ -386,11 +386,11 @@ static void mk_prologue(void){ /* $1 = build name */ "$(bin.emcc) -o $@ $(emcc_opt_full) $(emcc.flags) " "$(emcc.jsflags) -sENVIRONMENT=$(emcc.environment.$(1)) " - "\t\t$(pre-post.$(1).flags) " - "\t\t$(emcc.flags.$(1)) " - "\t\t$(cflags.common) $(cflags.$(1)) " - "\t\t$(SQLITE_OPT) " - "\t\t$(cflags.wasm_extra_init) $(sqlite3-wasm.c.in)\n" + " $(pre-post.$(1).flags) " + " $(emcc.flags.$(1)) " + " $(cflags.common) $(cflags.$(1)) " + " $(SQLITE_OPT) " + " $(cflags.wasm_extra_init) $(sqlite3-wasm.c.in)\n" "endef\n" ); @@ -949,13 +949,16 @@ int main(int argc, char const ** argv){ if(argc>1){ /* - ** Only emit the rules for the given list of builds, sans - ** prologue. Only for debugging, not makefile generation. + ** Only emit the rules for the given list of builds, sans prologue + ** (unless the arg "prologue" is given). Intended only for + ** debugging, not actual makefile generation. */ for( int i = 1; i < argc; ++i ){ char const * const zArg = argv[i]; #define E(N) if(0==strcmp(#N, zArg)) {mk_lib_mode(# N, &oBuildDefs.N);} else /**/ - BuildDefs_map(E) { + BuildDefs_map(E) if( 0==strcmp("prologue",zArg) ){ + mk_prologue(); + }else { fprintf(stderr,"Unkown build name: %s\n", zArg); rc = 1; break; diff --git a/manifest b/manifest index 47bc225dc9..2dd60b8d7c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Minor\slogging\sfix\sfor\sthe\swasm-opt\sbuild\sstep. -D 2025-09-25T14:39:41.488 +C Remove\ssome\ssuperfluous\stabs\sand\sadd\sthe\smkwasmbuilds\sability\sto\semit\sjust\sits\sprologue. +D 2025-09-25T14:44:03.291 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -634,7 +634,7 @@ F ext/wasm/index-dist.html 56132399702b15d70c474c3f1952541e25cb0922942868f70daf1 F ext/wasm/index.html 1b329fb63e057c02a17ce178308d6b06aac62d92af7dd6d821fb0e183e0f1557 F ext/wasm/jaccwabyt/jaccwabyt.js bbac67bc7a79dca34afe6215fd16b27768d84e22273507206f888c117e2ede7d F ext/wasm/jaccwabyt/jaccwabyt.md 167fc0b624c9bc2c477846e336de9403842d81b1a24fc4d3b24317cb9eba734f -F ext/wasm/mkwasmbuilds.c f89867e8af00d2f62fc27491316bf70b14e98d04078c68bd4cf11dd0c0841418 +F ext/wasm/mkwasmbuilds.c 3f27681fd3b32a78560feb3bb54f0f46a68f75024f65d9c5d4247f6bd08a04ad F ext/wasm/module-symbols.html dc476b403369b26a1a23773e13b80f41b9a49f0825e81435fe3600a7cfbbe337 F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96 F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63 @@ -2170,8 +2170,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P fabd6160d0c128592ce512b1160dfa0b89b1fbb03e11cd185c6a4888a85cc7fb -R 4a566edca33db4af9c1ce24cddc9e02b +P 918eca02d162cfa98613f9d8d9b0901f9f94ae1bcb53d811b09baec6c3f06bbe +R 888931dd12f1d1daafb4d7a18989fbd7 U stephan -Z 77b40953a04565b914727c2210ebe51e +Z 5855772d566dd2e7ecfc865653bcb725 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 53a1a88a33..9ea882406a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -918eca02d162cfa98613f9d8d9b0901f9f94ae1bcb53d811b09baec6c3f06bbe +75079401753778e3bc2f7fa307de9217e8d1ec395079fc1009060f707be32943