diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2018-05-02 18:24:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 18:24:57 +0200 |
| commit | a02fec47a05913318c9b55d7f5f692194d1de5f1 (patch) | |
| tree | d21a634c526ddbb42873fa0aa65410cab61714ff | |
| parent | 4c3c510a807ee57c564e7b8b7885cf4fa113bbd5 (diff) | |
| parent | a1aa98e05ad0ce1ba877ba77e187bc7ebc4f819a (diff) | |
Merge pull request #18562 from neikeq/issue-18526
Fix MSVC check when building with mono
| -rw-r--r-- | modules/mono/config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/config.py b/modules/mono/config.py index 18da468bba..18d9c67795 100644 --- a/modules/mono/config.py +++ b/modules/mono/config.py @@ -85,7 +85,7 @@ def configure(env): if not os.path.isfile(os.path.join(mono_lib_path, mono_static_lib_name + lib_suffix)): raise RuntimeError('Could not find static mono library in: ' + mono_lib_path) - if os.getenv('VCINSTALLDIR'): + if env.msvc: env.Append(LINKFLAGS=mono_static_lib_name + lib_suffix) env.Append(LINKFLAGS='Mincore' + lib_suffix) @@ -100,7 +100,7 @@ def configure(env): if not mono_lib_name: raise RuntimeError('Could not find mono library in: ' + mono_lib_path) - if os.getenv('VCINSTALLDIR'): + if env.msvc: env.Append(LINKFLAGS=mono_lib_name + Environment()['LIBSUFFIX']) else: env.Append(LIBS=mono_lib_name) |