msvc: Fix silent merge conflict between #13926 and #14372#15325
Merged
maflcko merged 1 commit intobitcoin:masterfrom Feb 4, 2019
ken2812221:msvc-merge-conflict
Merged
msvc: Fix silent merge conflict between #13926 and #14372#15325maflcko merged 1 commit intobitcoin:masterfrom ken2812221:msvc-merge-conflict
maflcko merged 1 commit intobitcoin:masterfrom
ken2812221:msvc-merge-conflict
Conversation
Member
|
cc @sipsorcery |
Member
|
tool_wallet seems to pass already: https://ci.appveyor.com/project/DrahtBot/bitcoin/builds/22082489#L129 |
Contributor
|
tACK |
Contributor
Author
|
@MarcoFalke I think that MSVC is trying to link with vcpkg's secp256k1 library that is in the cache. error if we clear the cache: https://ci.appveyor.com/project/ken2812221/bitcoin/builds/22067759 |
Contributor
|
tACK bef8fdd. |
maflcko
pushed a commit
to maflcko/bitcoin-core
that referenced
this pull request
Feb 4, 2019
…13926 and bitcoin#14372 bef8fdd msvc: Fix silent merge conflict between bitcoin#13926 and bitcoin#14372 (ken2812221) Pull request description: The bitcoin-wallet.exe would have to link with libsecp256k1 after we build libsecp256k1 in project. Tree-SHA512: cb3fafa301f39121f5d26ac8ac6009c9665fcad1061dbf14ba013104870abe5413ac57c97c97df12b6ba2ad709b776c51aeec20d41f3ae01d3460a5e18f40eec
maflcko
pushed a commit
that referenced
this pull request
Feb 14, 2019
… part II 3c6ef03 msvc: Fix silent merge conflict between #13926 and #14372 part II (Chun Kuan Lee) Pull request description: In #15325, I added secp256k1 as a dependency of bitcoin-wallet. However, I didn't notice that leveldb is also a dependency of it. Tree-SHA512: dc29b5cad6c529dd9517d6c2cbbe5297b69e73303e2fbbcd4b4842c9c5b51a4332df5a4bf3b82cd3ed2c1668cc95f8c9636f9485af0d722fed9c1319da3cc2e2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The bitcoin-wallet.exe would have to link with libsecp256k1 after we build libsecp256k1 in project.