From d59ac28d4f473f6b93bdf0d6b7f5d87dc8f777c4 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 19 May 2022 16:49:15 +0000 Subject: [PATCH] When building fiddle from its own directory (e.g. from emacs instead of the normal build process), force -O0 the sake of compilation speed. The top-level build now defaults to -Oz, which is more appropriate for that case. FossilOrigin-Name: 56b82ae806c61b95e62042ca70ed952ce01832b02da55c2b315f9201989514ab --- ext/fiddle/Makefile | 4 +++- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ext/fiddle/Makefile b/ext/fiddle/Makefile index a3bc352aec..0d4119247b 100644 --- a/ext/fiddle/Makefile +++ b/ext/fiddle/Makefile @@ -1,5 +1,7 @@ +# This makefile exists primarily to simplify/speed up development from +# emacs. It is not part of the canonical build process. default: - make -C ../.. fiddle + make -C ../.. fiddle -e emcc_opt=-O0 clean: make -C ../../ clean-fiddle diff --git a/manifest b/manifest index 9affdbba36..03a423f336 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Tweaks\sto\sthe\sfiddle\smake\starget\sso\sthat\sit\sbuilds\swith\sall\sof\sthe\ssame\nextensions\sas\sthe\sstandard\sCLI. -D 2022-05-19T16:42:41.466 +C When\sbuilding\sfiddle\sfrom\sits\sown\sdirectory\s(e.g.\sfrom\semacs\sinstead\sof\sthe\snormal\sbuild\sprocess),\sforce\s-O0\sthe\ssake\sof\scompilation\sspeed.\sThe\stop-level\sbuild\snow\sdefaults\sto\s-Oz,\swhich\sis\smore\sappropriate\sfor\sthat\scase. +D 2022-05-19T16:49:15.840 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -55,7 +55,7 @@ F ext/expert/expert1.test 3c642a4e7bbb14f21ddab595436fb465a4733f47a0fe5b2855e1d5 F ext/expert/sqlite3expert.c 6ca30d73b9ed75bd56d6e0d7f2c962d2affaa72c505458619d0ff5d9cdfac204 F ext/expert/sqlite3expert.h ca81efc2679a92373a13a3e76a6138d0310e32be53d6c3bfaedabd158ea8969b F ext/expert/test_expert.c d56c194b769bdc90cf829a14c9ecbc1edca9c850b837a4d0b13be14095c32a72 -F ext/fiddle/Makefile ea647919e6ac4b50edde1490f60ee87e8ccd75141e4aa650718c6f28eb323bbc +F ext/fiddle/Makefile b2904d52c10a7c984cfab95c54fb85f33aa8a6b2653faf1527d08ce57114be46 F ext/fiddle/fiddle.in.html ca27f4b0f0477096e78d8b9b44109c234d9305531ab63ecd559a739bdea0b11c F ext/fiddle/index.md d9c1c308d8074341bc3b11d1d39073cd77754cb3ca9aeb949f23fdd8323d81cf F ext/fiddle/module-post.js 3d1a368312c598f73eb5d1d715c464ca473d491ad5df4d0636fbcf91a74817a9 @@ -1959,8 +1959,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P eae3ab10c813d6f051d497271be2df05f54005ec54b19a2a27d04d632bccbeac -R 622d5630a2a019f5f30105c6f9f2cdad -U drh -Z 5b44594a37d68ccf6723c9a82bfea906 +P d46a6cb97406d90b9ad1da66369454e9b8f387ffbebcdf1c386c3c21f790c16f +R f9801562283af03ef889fbffa87ba13d +U stephan +Z edd8c70d727c3da0dc3ea944cb532c03 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 41869871aa..2ed938e2ed 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d46a6cb97406d90b9ad1da66369454e9b8f387ffbebcdf1c386c3c21f790c16f \ No newline at end of file +56b82ae806c61b95e62042ca70ed952ce01832b02da55c2b315f9201989514ab \ No newline at end of file -- 2.39.5