makefile.m32: fix to allow -ssh2-winssl combination #692
Conversation
This file contains 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
|
By analyzing the blame information on this pull request, we identified @gknauf, @captain-caveman2k and @bagder to be potential reviewers |
vszakats
added a commit
to curl/curl-for-win
that referenced
this pull request
Mar 2, 2016
* generate .def file and use it when building the .dll, making sure to limit the list of exported functions to libcurl ones. This should fix the bloated .dll and implib. * allow to build without nghttp2 * build with WinSSL if no other SSL backend is found * document the reason for -DCURL_LIBSTATIC option * fix building with WinSSL by using two local curl patches curl patches were submitted upstream as: curl/curl#692 curl/curl#693
vszakats
added a commit
to curl/curl-for-win
that referenced
this pull request
Mar 2, 2016
* generate .def file and use it when building the .dll, making sure to limit the list of exported functions to libcurl ones. This should fix the bloated .dll and implib. * allow to build without nghttp2 * build with WinSSL if no other SSL backend is found * document the reason for -DCURL_LIBSTATIC option * fix building with WinSSL by using two local curl patches curl patches were submitted upstream as: curl/curl#692 curl/curl#693
In makefile.m32, option -ssh2 (libssh2) automatically implied -ssl (OpenSSL) option, with no way to override it with -winssl. Since both libssh2 and curl support using Windows's built-in SSL backend, modify the logic to allow that combination.
|
Updated to default to SSL, like before. It means nothing gets lost after this patch, but now, if -ssh2 is used together with -winssl, SSL won't be forced anymore and let WinSSL be used instead. |
|
Thanks, landed in 05401b9. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
In makefile.m32, option -ssh2 (libssh2) automatically
implied -ssl (OpenSSL) option, with no way to override
it with -winssl. Since both libssh2 and curl support
using Windows's built-in SSL backend, modify the logic
to allow that combination.