diff options
| author | fanquake <fanquake@gmail.com> | 2020-12-02 09:20:28 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-12-02 10:11:37 +0800 |
| commit | 68bd88597a79eea5e329e2f1ebcd54df2da29a45 (patch) | |
| tree | 31957b31cd629b37529c6963a1f8cc240fdd55b9 /src | |
| parent | 9facca3ce0ad3c325676f9c9f0e6ed4429f0c335 (diff) | |
| parent | 01b647b1a20bbf1de2f5f4624c34b554ad3790f2 (diff) | |
| download | bitcoin-68bd88597a79eea5e329e2f1ebcd54df2da29a45.tar.xz | |
Merge #20505: [backport] build: Avoid secp256k1.h include from system
01b647b1a20bbf1de2f5f4624c34b554ad3790f2 build: Avoid secp256k1.h include from system (Niklas Gögge)
Pull request description:
Backports #20469 to the 0.21 branch.
ACKs for top commit:
hebasto:
ACK 01b647b1a20bbf1de2f5f4624c34b554ad3790f2, I have reviewed the code and it looks OK, I agree it can be merged.
Tree-SHA512: c098055b5e413be6f438d1d43e80c1943329ebb708531d8d82e72de402bddeb6f8b812303f9ae5a45abf62b3ff87fa909fbbf7fb56dca7959ecb9061febae4a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 67fd402603..c26cb34549 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,9 +20,8 @@ else LIBUNIVALUE = $(UNIVALUE_LIBS) endif -BITCOIN_INCLUDES=-I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) +BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/secp256k1/include $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) -BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) LIBBITCOIN_SERVER=libbitcoin_server.a |