diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-10-07 23:02:44 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-10-08 19:30:45 +0300 |
| commit | 67a733cd316638b31b5771f61e3b7f1d11f731f9 (patch) | |
| tree | 4916b8ecbf4b10a4596e053630f901b469677e83 /openssl/openssl/buildfile | |
| parent | 58745c41ec65d13a59559d423f698f9f8ad92361 (diff) | |
Release version 1.1.1+5v1.1.1+5
Adapt for building with Clang on Windows
Diffstat (limited to 'openssl/openssl/buildfile')
| -rw-r--r-- | openssl/openssl/buildfile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/openssl/openssl/buildfile b/openssl/openssl/buildfile index b03de5f..5d87cd0 100644 --- a/openssl/openssl/buildfile +++ b/openssl/openssl/buildfile @@ -15,6 +15,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') @@ -43,13 +45,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 } @@ -91,7 +92,7 @@ else { c.libs += $regex.apply(ws2_32 gdi32 crypt32, \ '(.+)', \ - $msvc ? '\1.lib' : '-l\1') - if $msvc + $msvc_runtime ? '\1.lib' : '-l\1') + if $msvc_runtime c.libs += advapi32.lib } |