aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules/windows.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-12-13 12:22:11 +0200
committerGitHub <noreply@github.com>2016-12-13 12:22:11 +0200
commitde83e94b5a9ce0f540814cee40ef3746b6ebb824 (patch)
treebe5504f488f980b6e394b4a2801864485c4dd792 /mesonbuild/modules/windows.py
parent07679f0330ccc4ee3839e702d79ecdd349437593 (diff)
parent2c83bd16fc03afd2d8605734dce1ffc1946bf3d2 (diff)
downloadmeson-de83e94b5a9ce0f540814cee40ef3746b6ebb824.zip
meson-de83e94b5a9ce0f540814cee40ef3746b6ebb824.tar.gz
meson-de83e94b5a9ce0f540814cee40ef3746b6ebb824.tar.bz2
Merge pull request #1171 from centricular/fix-extracted-generated-prebuilt-object-targets-linking
Several fixes to how we handle objects in build targets
Diffstat (limited to 'mesonbuild/modules/windows.py')
-rw-r--r--mesonbuild/modules/windows.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py
index cd4e343..ad882cb 100644
--- a/mesonbuild/modules/windows.py
+++ b/mesonbuild/modules/windows.py
@@ -19,9 +19,9 @@ import os
class WindowsModule:
def detect_compiler(self, compilers):
- for c in compilers:
- if c.language == 'c' or c.language == 'cpp':
- return c
+ for l in ('c', 'cpp'):
+ if l in compilers:
+ return compilers[l]
raise MesonException('Resource compilation requires a C or C++ compiler.')
def compile_resources(self, state, args, kwargs):