diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2021-08-18 04:07:09 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2021-08-18 04:07:09 +0530 |
| commit | 79fa93042ba9fe710071d3f1a742613fc08e5af8 (patch) | |
| tree | d1acc80e5fc288452e4ef6d888c927564c82ca64 | |
| parent | 8c5aa031b5ffb4eb3c61083072dcab49c8927d45 (diff) | |
| download | meson-79fa93042ba9fe710071d3f1a742613fc08e5af8.zip meson-79fa93042ba9fe710071d3f1a742613fc08e5af8.tar.gz meson-79fa93042ba9fe710071d3f1a742613fc08e5af8.tar.bz2 | |
Revert "Disable vs2017 + 32bit Rust combo as it is broken."nirbheek/un-disable-rust-vs2017
This reverts commit 75688240cfca7eed08c2754daa784c9bd1a70a73
Should've been fixed by c95bffb295dd8ae12dd37c9a6c33372a20cf9a68
| -rwxr-xr-x | run_project_tests.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 7896ee5..e1de2e3 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -1007,10 +1007,7 @@ def has_broken_rustc() -> bool: return pc.returncode != 0 def has_broken_compiler_combination() -> bool: - # Rust and vs2017 do not work together. But only with 32 bits. - if os.environ.get('VisualStudioVersion') == '15.0' and os.environ.get('Platform') == 'x86': - return True - # Clang-cl also fails with Rust. + # Clang-cl fails with Rust on the CI if shutil.which('cl') is None and shutil.which('clang-cl'): return True return False |