diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-11-08 12:53:41 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-11-08 12:53:43 -0500 |
| commit | e52781067bb463f9ec51fbe405067f52dbf4330d (patch) | |
| tree | 1a98eee9cba0eede387bc220d3093d6868968a0a | |
| parent | 11e1ac3ae08535cefbd8235a8deb6cd100bcb2b1 (diff) | |
| parent | 7a90b1b9d8d3297959c2d339192d8c90fb632db6 (diff) | |
| download | bitcoin-e52781067bb463f9ec51fbe405067f52dbf4330d.tar.xz | |
Merge #14686: build: Fix windows build error if `--disable-bip70`
7a90b1b9d8 build: Fix windows build error if `--disable-bip70` (Chun Kuan Lee)
Pull request description:
Fix #14677
The SSL library seems to be used even if bip70 disabled on Windows.
Tree-SHA512: 1c5fcf98048ce9e2eedf958326c11949eef74b3379a50d73751cb871d3d4323186caf607888c461a1fe1edc5f8515bd151ab247a843e7dda79f810c06309bd88
| -rw-r--r-- | src/Makefile.qt.include | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 3ca2a7451d..e3eb01304f 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -421,6 +421,10 @@ qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) if ENABLE_BIP70 qt_bitcoin_qt_LDADD += $(SSL_LIBS) +else +if TARGET_WINDOWS +qt_bitcoin_qt_LDADD += $(SSL_LIBS) +endif endif qt_bitcoin_qt_LDADD += $(CRYPTO_LIBS) qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) |