diff options
| author | George Marques | 2016-10-28 20:57:51 -0200 |
|---|---|---|
| committer | GitHub | 2016-10-28 20:57:51 -0200 |
| commit | a52cbd65a8cc512c0292daedac59c3d7f1900286 (patch) | |
| tree | a56edbd479d39b6fea46ea9e72a1902379bdd221 /modules | |
| parent | 8321e48ab0ac0700e1aef8f829140052c1ba4c6d (diff) | |
| parent | f7773d499dcd1d9580616dd1ba03f7382ac44cae (diff) | |
| download | godot-a52cbd65a8cc512c0292daedac59c3d7f1900286.tar.gz godot-a52cbd65a8cc512c0292daedac59c3d7f1900286.tar.zst godot-a52cbd65a8cc512c0292daedac59c3d7f1900286.zip | |
Merge pull request #6937 from SuperUserNameMan/fix_win_standalone_msvc_and_mingw_incompatibilities
fix bug introduced by #6501
Diffstat (limited to '')
| -rw-r--r-- | modules/openssl/SCsub | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/openssl/SCsub b/modules/openssl/SCsub index 3cc6f21bd..2327cf483 100644 --- a/modules/openssl/SCsub +++ b/modules/openssl/SCsub @@ -671,7 +671,7 @@ if (env["openssl"] != "system"): # builtin # Workaround for compilation error with GCC/Clang when -Werror is too greedy (GH-4517) import os import methods - if not (os.name=="nt" and methods.msvc_is_detected()): # not Windows and not MSVC + if not (os.name=="nt" and os.getenv("VCINSTALLDIR")): # not Windows and not MSVC env_openssl.Append(CFLAGS = ["-Wno-error=implicit-function-declaration"]) |