diff options
| author | fanquake <fanquake@gmail.com> | 2020-01-12 20:16:17 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-01-12 20:20:26 +0800 |
| commit | a05d14d4a00eceb03c14ca04de131116075b10f4 (patch) | |
| tree | 2c391bb4513ef2b967892ac48bb4c06b58914d17 | |
| parent | 29d70264fb3afe0d369ea0e32ed184c1f3b08083 (diff) | |
| parent | 9a0ebb7f029a1389b680b26a2c3c0529f5ddb07e (diff) | |
Merge #17881: [0.18] scripts: fix check-symbols & check-security argument passing
9a0ebb7f029a1389b680b26a2c3c0529f5ddb07e scripts: fix check-symbols & check-security argument passing (fanquake)
Pull request description:
Backport of https://github.com/bitcoin/bitcoin/pull/17857.
The first argument in bin_PROGRAMS (bitcoind) was being silently
dropped and never passed into the check-security.py or check-symbols.py scripts.
This has been the case since the scripts were added to the makefile in
https://github.com/bitcoin/bitcoin/commit/f3d3eaf78eb51238d799d8f20a585550d1567719.
Example of the behavior:
```python
# touch a, touch b, touch c
# python3 args.py < a b c
import sys
if __name__ == '__main__':
print(sys.argv)
# ['args.py', 'b', 'c']
# if you add some lines to "a",
# you'll see them here..
for line in sys.stdin:
print(line)
```
Github-Pull: #17857
Rebased-From: 71af793512100ee7d508c3fb815af47925fe80ba
Top commit has no ACKs.
Tree-SHA512: 0dc5dc4efc11a98e85e30bae7acd6e8139673dec28ea7c3151c03f9e30145faf91af2cf707659b46e120dda42e254355c669451c6bf4d93467d061568e1b2c11
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d491530ca1..780bec376d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -638,13 +638,13 @@ clean-local: check-symbols: $(bin_PROGRAMS) if GLIBC_BACK_COMPAT @echo "Checking glibc back compat..." - $(AM_V_at) READELF=$(READELF) CPPFILT=$(CPPFILT) $(top_srcdir)/contrib/devtools/symbol-check.py < $(bin_PROGRAMS) + $(AM_V_at) READELF=$(READELF) CPPFILT=$(CPPFILT) $(top_srcdir)/contrib/devtools/symbol-check.py $(bin_PROGRAMS) endif check-security: $(bin_PROGRAMS) if HARDEN @echo "Checking binary security..." - $(AM_V_at) READELF=$(READELF) OBJDUMP=$(OBJDUMP) $(top_srcdir)/contrib/devtools/security-check.py < $(bin_PROGRAMS) + $(AM_V_at) READELF=$(READELF) OBJDUMP=$(OBJDUMP) $(top_srcdir)/contrib/devtools/security-check.py $(bin_PROGRAMS) endif if ENABLE_BIP70 |