aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-05-23 21:56:12 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2021-05-23 21:56:12 +0300
commitf54e99a34d2f9a741dbcc358e7b26d4cbaaad7c7 (patch)
tree955785f9b4a12e87b5afbc9248c6f29014fdbfb5
parent7e7a23293b165313412771997fceda376c1e57eb (diff)
downloadmeson-vsenvfix.zip
meson-vsenvfix.tar.gz
meson-vsenvfix.tar.bz2
Also skip VS activation if gcc is found.vsenvfix
-rw-r--r--mesonbuild/mesonmain.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index ce59ba4..f5be6c3 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -46,6 +46,8 @@ def setup_vsenv():
# If an existing build tool chain exists in PATH -> do nothing.
if shutil.which('cc'):
return
+ if shutil.which('gcc'):
+ return
if shutil.which('clang'):
return
if shutil.which('clang-cl'):