Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge bitcoin#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 bitcoin#14677
  The SSL library seems to be used even if bip70 disabled on Windows.

Tree-SHA512: 1c5fcf98048ce9e2eedf958326c11949eef74b3379a50d73751cb871d3d4323186caf607888c461a1fe1edc5f8515bd151ab247a843e7dda79f810c06309bd88
  • Loading branch information
MarcoFalke authored and dzutto committed Aug 27, 2021
1 parent 62535a0 commit 2809b85
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/Makefile.qt.include
Expand Up @@ -423,6 +423,10 @@ qt_dash_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(BLS_LIBS) $(GMP_LIBS)
if ENABLE_BIP70
qt_dash_qt_LDADD += $(SSL_LIBS)
else
if TARGET_WINDOWS
qt_dash_qt_LDADD += $(SSL_LIBS)
endif
endif
qt_dash_qt_LDADD += $(CRYPTO_LIBS)
qt_dash_qt_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
Expand Down

0 comments on commit 2809b85

Please sign in to comment.