Skip to content

Commit e527810

Browse files
author
MarcoFalke
committed
Merge #14686: build: Fix windows build error if --disable-bip70
7a90b1b 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
2 parents 11e1ac3 + 7a90b1b commit e527810

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/Makefile.qt.include

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,10 @@ qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL)
421421
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
422422
if ENABLE_BIP70
423423
qt_bitcoin_qt_LDADD += $(SSL_LIBS)
424+
else
425+
if TARGET_WINDOWS
426+
qt_bitcoin_qt_LDADD += $(SSL_LIBS)
427+
endif
424428
endif
425429
qt_bitcoin_qt_LDADD += $(CRYPTO_LIBS)
426430
qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)

0 commit comments

Comments
 (0)