summaryrefslogtreecommitdiff
path: root/libssl/libssl/buildfile
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-10-07 23:02:44 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-10-08 19:30:45 +0300
commit67a733cd316638b31b5771f61e3b7f1d11f731f9 (patch)
tree4916b8ecbf4b10a4596e053630f901b469677e83 /libssl/libssl/buildfile
parent58745c41ec65d13a59559d423f698f9f8ad92361 (diff)
Release version 1.1.1+5v1.1.1+5
Adapt for building with Clang on Windows
Diffstat (limited to 'libssl/libssl/buildfile')
-rw-r--r--libssl/libssl/buildfile11
1 files changed, 6 insertions, 5 deletions
diff --git a/libssl/libssl/buildfile b/libssl/libssl/buildfile
index 1f5838a..3187435 100644
--- a/libssl/libssl/buildfile
+++ b/libssl/libssl/buildfile
@@ -14,6 +14,8 @@ linux = ($tclass == 'linux')
bsd = ($tclass == 'bsd')
windows = ($tclass == 'windows')
+msvc_runtime = ($c.target.system == 'win32-msvc')
+
gcc = ($c.class == 'gcc')
msvc = ($c.class == 'msvc')
mingw = ($c.target.system == 'mingw32')
@@ -47,13 +49,12 @@ else
# Note that upstream also passes -DOPENSSL_USE_APPLINK if compiled with VC.
# We drop this option (see libcrypto/buildfile) for details.
#
- if $msvc
- {
+ if $msvc_runtime
c.poptions += -DOPENSSL_SYS_WIN32 -D_CRT_SECURE_NO_DEPRECATE \
-D_WINSOCK_DEPRECATED_NO_WARNINGS
+ if $msvc
c.coptions += /Gs0 /GF /Gy
- }
else
c.poptions += -D_MT
}
@@ -109,9 +110,9 @@ else
c.libs += $regex.apply(ws2_32 gdi32 crypt32, \
'(.+)', \
- $msvc ? '\1.lib' : '-l\1')
+ $msvc_runtime ? '\1.lib' : '-l\1')
- if $msvc
+ if $msvc_runtime
c.libs += advapi32.lib
}