diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-05-11 19:07:02 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-05-11 19:07:02 +0200 |
| commit | eb64a8d373b835152794a1b1330fdb6d63599e51 (patch) | |
| tree | dfe934f412bdd0a7c8987b121a114b2fafa5fdae | |
| parent | b42c4cce0f378ca51cd30aa542299bad8c575512 (diff) | |
| parent | 972b0f78b3f89ea5096bc37658ceb859ad47fa44 (diff) | |
Merge pull request #4626 from akien-mga/pr-msvc-build
Windows: Fix MinGW argument being passed to MSVC
| -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) |