From e1b50309dfd9c927866f36a0a4662321351ab697 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 21 Jan 2019 23:59:20 +0200 Subject: All the fixes needed to make work against current master. --- mesonbuild/environment.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mesonbuild/environment.py') diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 87d221d..d853020 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -753,7 +753,7 @@ class Environment: def detect_cuda_compiler(self, want_cross): popen_exceptions = {} - compilers, ccache, is_cross, exe_wrap = self._get_compilers('cuda', 'Cuda', want_cross) + compilers, ccache, is_cross, exe_wrap = self._get_compilers('cuda', want_cross) for compiler in compilers: if isinstance(compiler, str): compiler = [compiler] @@ -1033,9 +1033,9 @@ class Environment: if need_cross_compiler: cross_comp = self.detect_objc_compiler(True) elif lang == 'cuda': - comp = self.environment.detect_cuda_compiler(False) + comp = self.detect_cuda_compiler(False) if need_cross_compiler: - cross_comp = self.environment.detect_cuda_compiler(True) + cross_comp = self.detect_cuda_compiler(True) elif lang == 'objcpp': comp = self.detect_objcpp_compiler(False) if need_cross_compiler: -- cgit v1.1