diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-05-11 18:48:04 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-05-11 18:48:04 +0200 |
| commit | 972b0f78b3f89ea5096bc37658ceb859ad47fa44 (patch) | |
| tree | bc1ed9190a0c6735d8c8f35bbcc69087a7090ae2 /drivers/builtin_openssl2 | |
| parent | 7b471068cf8e4d166d8b0569b489f595213c3b52 (diff) | |
Windows: Fix MinGW argument being passed to MSVC
Fixes #4620
Diffstat (limited to 'drivers/builtin_openssl2')
| -rw-r--r-- | drivers/builtin_openssl2/SCsub | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/builtin_openssl2/SCsub b/drivers/builtin_openssl2/SCsub index a51b0a3ed6..5aa2740b6d 100644 --- a/drivers/builtin_openssl2/SCsub +++ b/drivers/builtin_openssl2/SCsub @@ -650,8 +650,10 @@ env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/asn1"]) env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"]) #env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"]) env_ssl.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"]) -env_ssl.Append(CFLAGS=["-Wno-error=implicit-function-declaration"]); - -env_ssl.add_source_files(env.drivers_sources,openssl_sources) +# Workaround for compilation error with MinGW +import os +if (os.name=="nt" and os.getenv("VSINSTALLDIR")==None): # Windows and not MSVC, so likely MinGW + env_ssl.Append(CFLAGS=["-Wno-error=implicit-function-declaration"]); +env_ssl.add_source_files(env.drivers_sources,openssl_sources) |