Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from Nov 8, 2018

Conversation

Projects
None yet
4 participants
@ken2812221
Copy link
Member

commented Nov 7, 2018

Fix #14677
The SSL library seems to be used even if bip70 disabled on Windows.

@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Nov 8, 2018

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

No conflicts as of last run.

@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Nov 8, 2018

Gitian builds for commit 11e1ac3 (master):

Gitian builds for commit 67a71c284fea254928fe0ec5d59a39c3d2765a7d (master and this pull):

@ryanofsky
Copy link
Contributor

left a comment

I think it would be preferable to add libssl to $(QT_LIBS) if it's a dependency of qt code.

But this change seems fine as a workaround if needed, so utACK 7a90b1b.

@MarcoFalke

This comment has been minimized.

Copy link
Member

commented Nov 8, 2018

Going to merge this, since it has a tested ack in the linked issue.

@MarcoFalke MarcoFalke merged commit 7a90b1b into bitcoin:master Nov 8, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

MarcoFalke added a commit that referenced this pull request Nov 8, 2018

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

@ken2812221 ken2812221 deleted the ken2812221:fix-windows-disable-bip70 branch Nov 8, 2018

@ryanofsky

This comment has been minimized.

Copy link
Contributor

commented Nov 8, 2018

It's good to have this working, but I am still a little suspicious about this fix. If anyone with more knowledge about the build system wants to take another look at this, I think that would be useful.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.