This is mostly just being consistent with how we do things, and migrating towards a style (we have already been doing so ad-hoc) that is clearer for anyone who cares to read .m4
. For example:
master
:
0 AX_CHECK_COMPILE_FLAG(
1 [-g3],
2 [[DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS -g3"]],
3 [AX_CHECK_COMPILE_FLAG([-g],[[DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS -g"]],,[[$CXXFLAG_WERROR]])],
4 [[$CXXFLAG_WERROR]])
This PR:
0 AX_CHECK_COMPILE_FLAG(
1 [-g3],
2 [DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS -g3"],
3 [AX_CHECK_COMPILE_FLAG([-g], [DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS -g"], [], [$CXXFLAG_WERROR])],
4 [$CXXFLAG_WERROR])
Drop unneeded double-quoting (which we use inconsistently), use []
for empty arguments, space things out.
There should be no functional change, before & after binaries identical. Very boring.
Guix build:
0bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
122097cd621cd88348f827b916f4b4b120b40c3515a3752595347e36d57dc9158 guix-build-34094aff1348/output/aarch64-linux-gnu/SHA256SUMS.part
243f10bb857afa7ea52a8ed9beed36ff0e3ee02dba31100fc04c8e0b2443d94eb guix-build-34094aff1348/output/aarch64-linux-gnu/bitcoin-34094aff1348-aarch64-linux-gnu-debug.tar.gz
39095a8228376094065103f4adc9cdcb8189111fb9536ad88e4f8cecc3df6fc75 guix-build-34094aff1348/output/aarch64-linux-gnu/bitcoin-34094aff1348-aarch64-linux-gnu.tar.gz
49c73179059c6fe1f7643445ec5a530003fc41187aa0a94cb1f5c106097161e5b guix-build-34094aff1348/output/arm-linux-gnueabihf/SHA256SUMS.part
570ddd4dd0a06c7491937084125f690c1d62fa2647c16048fc1a4a9a09d8b10b4 guix-build-34094aff1348/output/arm-linux-gnueabihf/bitcoin-34094aff1348-arm-linux-gnueabihf-debug.tar.gz
60a338fdc9788c33a0d519b6c09fdf6271e3bd68846ee61eef0a06a2df6bab419 guix-build-34094aff1348/output/arm-linux-gnueabihf/bitcoin-34094aff1348-arm-linux-gnueabihf.tar.gz
725eda7fae2984b9dadf47420d1dc09b0224d425144233482602bd9e6d348255c guix-build-34094aff1348/output/dist-archive/bitcoin-34094aff1348.tar.gz
8d70d84e43ffa2d809063cda868f708539e9114b2d14edb6ddcf05fdf73f3187b guix-build-34094aff1348/output/powerpc64-linux-gnu/SHA256SUMS.part
98d1291e576d2b5f8f7120fe6e6ed4b23415249e22a657a350ccce68ff261e088 guix-build-34094aff1348/output/powerpc64-linux-gnu/bitcoin-34094aff1348-powerpc64-linux-gnu-debug.tar.gz
10eab448186aee18ac33c39eed4d24501208d10d257fe6e2739adf589b1d4b693a guix-build-34094aff1348/output/powerpc64-linux-gnu/bitcoin-34094aff1348-powerpc64-linux-gnu.tar.gz
114d28617b4d0ddb88c8b20d06ca21314ee40814043f92cabcd9ea3e3d8ee39183 guix-build-34094aff1348/output/powerpc64le-linux-gnu/SHA256SUMS.part
12dea02168e170e92600012f5806ec8b39209282c2270669f2040682f74bc3f320 guix-build-34094aff1348/output/powerpc64le-linux-gnu/bitcoin-34094aff1348-powerpc64le-linux-gnu-debug.tar.gz
13c7122e89d3186a183ac08e7f3020654722c98bf8acc8b790bb292b39f5ba8225 guix-build-34094aff1348/output/powerpc64le-linux-gnu/bitcoin-34094aff1348-powerpc64le-linux-gnu.tar.gz
140802a52720d2bec1264dc13f6554a9da347baa3d096242b29bb524f4b121eb10 guix-build-34094aff1348/output/riscv64-linux-gnu/SHA256SUMS.part
154aee9fc41f35d2adb2d0562902dd8584a8413a73c015ddcdcef00586779f63a7 guix-build-34094aff1348/output/riscv64-linux-gnu/bitcoin-34094aff1348-riscv64-linux-gnu-debug.tar.gz
163f0c4d6096ac7e08389e851c2d252632c044a700ce0174473ac4d7f66290e8cc guix-build-34094aff1348/output/riscv64-linux-gnu/bitcoin-34094aff1348-riscv64-linux-gnu.tar.gz
17c5149c46b9b7081d5715daf3e22fd30ffca23d333f664da1fabc8143ff8bf76c guix-build-34094aff1348/output/x86_64-apple-darwin19/SHA256SUMS.part
1881848355751e55a8a60636e3ea2f03ca6abb78736a5431715cd51cebd46bb961 guix-build-34094aff1348/output/x86_64-apple-darwin19/bitcoin-34094aff1348-osx-unsigned.dmg
19d2f6f689cbedddd865f90dba9ddf21479c71c61b0350fda62804b2f233116a43 guix-build-34094aff1348/output/x86_64-apple-darwin19/bitcoin-34094aff1348-osx-unsigned.tar.gz
2099d8fe428fcb67f9975e6b8d9a63d84946215a0a6b8f94967ce96cc3af4b7772 guix-build-34094aff1348/output/x86_64-apple-darwin19/bitcoin-34094aff1348-osx64.tar.gz
213dac13c7556d9a25ff5513bbb2638fe4fa74d8a88304bbdce52364df7832a3ab guix-build-34094aff1348/output/x86_64-linux-gnu/SHA256SUMS.part
22e4baa7da80fdabbb50953efaaa7b4867c7e575a7a156b728e8e197142df55697 guix-build-34094aff1348/output/x86_64-linux-gnu/bitcoin-34094aff1348-x86_64-linux-gnu-debug.tar.gz
23f82f5bcc7197c1741b106f62be7b468aadbdf5b3198091582026cd450bf13b3a guix-build-34094aff1348/output/x86_64-linux-gnu/bitcoin-34094aff1348-x86_64-linux-gnu.tar.gz
24db22b5f48783917f985920ddb26aa170b4d6cc65112406548847a883099505b8 guix-build-34094aff1348/output/x86_64-w64-mingw32/SHA256SUMS.part
25ead0809193ca1d462553a6f3f233cdbff7a3f8419100d825abfc10835508e485 guix-build-34094aff1348/output/x86_64-w64-mingw32/bitcoin-34094aff1348-win-unsigned.tar.gz
26e1006b6c114eaf33274144d8e9a20abc0cee01e26a4594063ee615bf09c1b344 guix-build-34094aff1348/output/x86_64-w64-mingw32/bitcoin-34094aff1348-win64-debug.zip
272d3fbc593b58d353a6859e02c0dd096d453cf5f1e3150c2a1c234bdfc97b4f24 guix-build-34094aff1348/output/x86_64-w64-mingw32/bitcoin-34094aff1348-win64-setup-unsigned.exe
2825cfa8a3655727572593f100b7a70c1061fa6f3b017014ad7444059611c3ddda guix-build-34094aff1348/output/x86_64-w64-mingw32/bitcoin-34094aff1348-win64.zip