mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-21 14:34:49 +01:00
Code Issues Projects Releases Wiki Activity

Merge #14686: build: Fix windows build error if --disable-bip70

Browse source 
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
This commit is contained in:
MarcoFalke 2018-11-08 12:53:41 -05:00
commit e52781067b
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Makefile.qt.include
View file

@ -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)