Skip to content

Commit d9ea7c2

Browse files
committed
fix: restore bazel/curl.BUILD
1 parent 34673a6 commit d9ea7c2

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

bazel/curl.BUILD

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ CURL_WIN_COPTS = [
145145
"/DCURL_DISABLE_PROXY",
146146
"/DHAVE_LIBZ",
147147
"/DHAVE_ZLIB_H",
148-
"/DUSE_OPENSSL",
149-
"/DHAVE_BORINGSSL",
150148
# Defining _USING_V110_SDK71_ is hackery to defeat curl's incorrect
151149
# detection of what OS releases we can build on with VC 2012. This
152150
# may not be needed (or may have to change) if the WINVER setting
@@ -159,7 +157,8 @@ CURL_WIN_SRCS = [
159157
"lib/inet_ntop.c",
160158
"lib/system_win32.c",
161159
"lib/x509asn1.c",
162-
"lib/vtls/openssl.c",
160+
"lib/vtls/schannel.c",
161+
"lib/vtls/schannel_verify.c",
163162
"lib/idn_win32.c",
164163
]
165164

@@ -454,10 +453,14 @@ cc_library(
454453
visibility = ["//visibility:public"],
455454
deps = [
456455
":define-ca-bundle-location",
457-
"@boringssl//:ssl",
458456
"@com_github_cares_cares//:ares",
459457
"@zlib",
460-
],
458+
] + select({
459+
":windows": [],
460+
"//conditions:default": [
461+
"@boringssl//:ssl",
462+
],
463+
}),
461464
)
462465

463466
write_file(
@@ -481,6 +484,7 @@ write_file(
481484
"# define BUILDING_LIBCURL 1",
482485
"# define CURL_DISABLE_CRYPTO_AUTH 1",
483486
"# define CURL_DISABLE_DICT 1",
487+
"# define CURL_DISABLE_FILE 1",
484488
"# define CURL_DISABLE_GOPHER 1",
485489
"# define CURL_DISABLE_IMAP 1",
486490
"# define CURL_DISABLE_LDAP 1",
@@ -491,15 +495,9 @@ write_file(
491495
"# define CURL_DISABLE_TELNET 1",
492496
"# define CURL_DISABLE_TFTP 1",
493497
"# define CURL_PULL_WS2TCPIP_H 1",
494-
"# define USE_OPENSSL 1",
495-
"# define HAVE_BORINGSSL 1",
496-
"# define HAVE_LIBSSL 1",
497-
"# define HAVE_OPENSSL_SSL_H 1",
498-
"# define HAVE_OPENSSL_CRYPTO_H 1",
499-
"# define HAVE_OPENSSL_PEM_H 1",
500-
"# define HAVE_OPENSSL_X509_H 1",
501-
"# define HAVE_OPENSSL_ERR_H 1",
498+
"# define USE_WINDOWS_SSPI 1",
502499
"# define USE_WIN32_IDN 1",
500+
"# define USE_SCHANNEL 1",
503501
"# define WANT_IDN_PROTOTYPES 1",
504502
"#elif defined(__APPLE__)",
505503
"# define HAVE_FSETXATTR_6 1",
@@ -545,6 +543,7 @@ write_file(
545543
"",
546544
"#if !defined(_WIN32)",
547545
"# define CURL_DISABLE_DICT 1",
546+
"# define CURL_DISABLE_FILE 1",
548547
"# define CURL_DISABLE_GOPHER 1",
549548
"# define CURL_DISABLE_IMAP 1",
550549
"# define CURL_DISABLE_LDAP 1",

0 commit comments

Comments
 (0)