Skip to content

Commit 46436d0

Browse files
noburhenium
authored andcommitted
openssl: search winsock
* ext/openssl/extconf.rb: on Windows search winsock library always, regardless pkg-config. direct use of winsock is not region of OpenSSL. [ruby-core:85895] [Bug #14568] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Sync-with-trunk: r62637
1 parent 97252d2 commit 46436d0

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

ext/openssl/extconf.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,16 @@
3333
Logging::message "=== Checking for system dependent stuff... ===\n"
3434
have_library("nsl", "t_open")
3535
have_library("socket", "socket")
36+
if $mswin || $mingw
37+
have_library("ws2_32")
38+
end
3639

3740
Logging::message "=== Checking for required stuff... ===\n"
3841
result = pkg_config("openssl") && have_header("openssl/ssl.h")
3942

4043
def find_openssl_library
4144
if $mswin || $mingw
4245
# required for static OpenSSL libraries
43-
have_library("ws2_32")
4446
have_library("gdi32") # OpenSSL <= 1.0.2 (for RAND_screen())
4547
have_library("crypt32")
4648
end

0 commit comments

Comments
 (0)