davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

makefile: fix glob expansion for macOS

Browse Source 
when bash expands bitcoin/*.h, it returns the files in lexicographically sorted order by default this is not necessarily the case for macOS so it has be explicitly sorted. I get a fairly uninformative error like this:

make: *** [check-bitcoin-makefile] Error 1

The error is now more informative and does not error on a clean branch on macOS:

BITCOIN_HEADERS missing: bitcoin/signature.h bitcoin/tx_parts.h bitcoin/tx.h bitcoin/varint.h
make: *** [check-bitcoin-makefile] Error 1
This commit is contained in:
Sangbida Chaudhuri
2025-10-16 11:30:36 +10:30
committed by Rusty Russell
parent c758672ac0
commit ad0c7318c1
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bitcoin/Makefile
View File

@@ -47,7 +47,16 @@ ALL_C_SOURCES += $(BITCOIN_SRC)
check-makefile: check-bitcoin-makefile
check-bitcoin-makefile:
@if [ "`echo bitcoin/*.h`" != "$(BITCOIN_HEADERS)" ]; then echo BITCOIN_HEADERS incorrect; exit 1; fi
@MISSING="$(filter-out $(BITCOIN_HEADERS), $(wildcard bitcoin/*.h))"; \
EXTRA="$(filter-out $(wildcard bitcoin/*.h), $(BITCOIN_HEADERS))"; \
if [ -n "$$MISSING" ]; then \
echo "BITCOIN_HEADERS missing: $$MISSING"; \
exit 1; \
fi; \
if [ -n "$$EXTRA" ]; then \
echo "BITCOIN_HEADERS has non-existent: $$EXTRA"; \
exit 1; \
fi
check-whitespace: check-whitespace/bitcoin/Makefile