From 972b0f78b3f89ea5096bc37658ceb859ad47fa44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 11 May 2016 18:48:04 +0200 Subject: [PATCH] Windows: Fix MinGW argument being passed to MSVC Fixes #4620 --- drivers/builtin_openssl2/SCsub | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/builtin_openssl2/SCsub b/drivers/builtin_openssl2/SCsub index a51b0a3ed6a..5aa2740b6d3 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"]); + +# 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) - -