diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-10-23 16:14:40 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-11-04 15:42:06 +0000 |
| commit | d35034b21bfdcbdb21853340ff983e908ada101f (patch) | |
| tree | fd117c606d782b8babef82cdf9a1639fbd3623af | |
| parent | 198e8691625419b50000c5825209843184dd2441 (diff) | |
| download | meson-d35034b21bfdcbdb21853340ff983e908ada101f.zip meson-d35034b21bfdcbdb21853340ff983e908ada101f.tar.gz meson-d35034b21bfdcbdb21853340ff983e908ada101f.tar.bz2 | |
Use 'rc' resource compiler with clang-cl toolchain
The LLVM toolchain doesn't come with a Windows resource compiler at
the moment. Use 'rc' from the Windows SDK.
| -rw-r--r-- | mesonbuild/modules/windows.py | 2 | ||||
| -rwxr-xr-x | run_unittests.py | 2 |
2 files changed, 2 insertions, 2 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) diff --git a/run_unittests.py b/run_unittests.py index 84dcd36..474b87a 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -3070,7 +3070,7 @@ class WindowsTests(BasePlatformTests): # resource compiler depfile generation is not yet implemented for msvc env = get_fake_env(testdir, self.builddir, self.prefix) - depfile_works = env.detect_c_compiler(False).get_id() != 'msvc' + depfile_works = env.detect_c_compiler(False).get_id() not in ['msvc', 'clang-cl'] self.init(testdir) self.build() |