From c7292b1f3d22323352a14e756497b03d66c90666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 11 May 2016 19:41:52 +0200 Subject: [PATCH] OpenSSL buildsystem: actually apply the flag on gcc/clang Commit 972b0f7 was bogus. --- drivers/builtin_openssl2/SCsub | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/builtin_openssl2/SCsub b/drivers/builtin_openssl2/SCsub index 5aa2740b6d3..395dd21eef4 100644 --- a/drivers/builtin_openssl2/SCsub +++ b/drivers/builtin_openssl2/SCsub @@ -651,9 +651,9 @@ 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"]) -# Workaround for compilation error with MinGW +# Workaround for compilation error with GCC/Clang when -Werror is too greedy (GH-4517) 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"]); +if not (os.name=="nt" and os.getenv("VSINSTALLDIR")!=None): # not Windows and not MSVC + env_ssl.Append(CFLAGS=["-Wno-error=implicit-function-declaration"]) env_ssl.add_source_files(env.drivers_sources,openssl_sources)