diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-01-21 23:59:20 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-01-21 23:59:20 +0200 |
| commit | e1b50309dfd9c927866f36a0a4662321351ab697 (patch) | |
| tree | b3fb38d1a391f4e33004b95eba2ea6d17a8dd762 /mesonbuild/environment.py | |
| parent | 140975116905e7637e906e645b588e03b8c3aebb (diff) | |
| download | meson-e1b50309dfd9c927866f36a0a4662321351ab697.zip meson-e1b50309dfd9c927866f36a0a4662321351ab697.tar.gz meson-e1b50309dfd9c927866f36a0a4662321351ab697.tar.bz2 | |
All the fixes needed to make work against current master.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 6 |
1 files changed, 3 insertions, 3 deletions
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: |