diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-11-04 19:56:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-04 19:56:08 +0200 |
| commit | 1eb455f8696643b625b10a85551ff9fd28dd7d2a (patch) | |
| tree | f6fa0bb549b609d3db1fea05181e7ff92c6b1fa3 /mesonbuild/modules/windows.py | |
| parent | 253c581412d7f2b09af353dd83d943454bd555be (diff) | |
| parent | ac6d4338cce68f5040825fb9bfb95dd147390e76 (diff) | |
| download | meson-1eb455f8696643b625b10a85551ff9fd28dd7d2a.zip meson-1eb455f8696643b625b10a85551ff9fd28dd7d2a.tar.gz meson-1eb455f8696643b625b10a85551ff9fd28dd7d2a.tar.bz2 | |
Merge pull request #4250 from jon-turney/windows-clang-cl
Add support for clang-cl on Windows
Diffstat (limited to 'mesonbuild/modules/windows.py')
| -rw-r--r-- | mesonbuild/modules/windows.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py index f0d5113..4d0f244 100644 --- a/mesonbuild/modules/windows.py +++ b/mesonbuild/modules/windows.py @@ -60,7 +60,7 @@ class WindowsModule(ExtensionModule): if not rescomp or not rescomp.found(): comp = self.detect_compiler(state.compilers) - if comp.id == 'msvc': + if comp.id == 'msvc' or comp.id == 'clang-cl': rescomp = ExternalProgram('rc', silent=True) else: rescomp = ExternalProgram('windres', silent=True) |