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 /libcrypto/libcrypto/buildfile | |
| parent | 58745c41ec65d13a59559d423f698f9f8ad92361 (diff) | |
Release version 1.1.1+5v1.1.1+5
Adapt for building with Clang on Windows
Diffstat (limited to 'libcrypto/libcrypto/buildfile')
| -rw-r--r-- | libcrypto/libcrypto/buildfile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libcrypto/libcrypto/buildfile b/libcrypto/libcrypto/buildfile index 34c62bc..2c81156 100644 --- a/libcrypto/libcrypto/buildfile +++ b/libcrypto/libcrypto/buildfile @@ -33,6 +33,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') @@ -74,13 +76,12 @@ else # particular, we don't pass -DOPENSSL_USE_APPLINK preprocessor option no # compile uplink.c and auto-generated uplink-x86_64.asm. # - 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 } @@ -212,11 +213,11 @@ else if $mingw libs{crypto}: c.loptions += -Wl,--enable-auto-image-base - c.libs += $regex.apply(ws2_32 gdi32 crypt32, \ - '(.+)', \ - $msvc ? '\1.lib' : '-l\1') + c.libs += $regex.apply(ws2_32 gdi32 crypt32, \ + '(.+)', \ + $msvc_runtime ? '\1.lib' : '-l\1') - if $msvc + if $msvc_runtime { # Suppress the 'object file does not define any public symbols' warning. # |