diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-10-03 11:36:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 11:36:44 +0200 |
| commit | 9fce85f9d772bfc51df8f5e861986914fce0fc5d (patch) | |
| tree | 4ac238a50d70aeff0fd384c28ec197a90d0766de /drivers/builtin_openssl2/SCsub | |
| parent | 90f4e76a463713826b81a768444ce318dcdb3aa0 (diff) | |
| parent | 663d4ee7de9741e4e55255908fbecd8582097ae3 (diff) | |
Merge pull request #6501 from SuperUserNameMan/windows_compile_with_standalone_msvc
scons detects standalone MSVC on Windows
Diffstat (limited to 'drivers/builtin_openssl2/SCsub')
| -rw-r--r-- | drivers/builtin_openssl2/SCsub | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/builtin_openssl2/SCsub b/drivers/builtin_openssl2/SCsub index a28bc2922c..0c035cc4a5 100644 --- a/drivers/builtin_openssl2/SCsub +++ b/drivers/builtin_openssl2/SCsub @@ -656,7 +656,8 @@ if "platform" in env and env["platform"] == "winrt": # Workaround for compilation error with GCC/Clang when -Werror is too greedy (GH-4517) import os -if not (os.name=="nt" and os.getenv("VSINSTALLDIR")!=None): # not Windows and not MSVC +import methods +if not (os.name=="nt" and methods.msvc_is_detected() ): # not Windows and not MSVC env_drivers.Append(CFLAGS=["-Wno-error=implicit-function-declaration"]) env_drivers.add_source_files(env.drivers_sources,openssl_sources) |