diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-10-10 01:04:45 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-10-10 10:00:28 -0700 |
| commit | 508662f277e789acc7e49ffbf58de4752f0891fc (patch) | |
| tree | f2ec6da9a8bc243055c670504c1d49a56811f23f /mesonbuild/environment.py | |
| parent | 34ea71239db48951573180a41326d85890a6bb2e (diff) | |
| download | meson-508662f277e789acc7e49ffbf58de4752f0891fc.zip meson-508662f277e789acc7e49ffbf58de4752f0891fc.tar.gz meson-508662f277e789acc7e49ffbf58de4752f0891fc.tar.bz2 | |
BUGFIX: environment.py CudaCompiler missing info arg
fixes regression for systems with nvcc installed--perhaps why not previously caught on CI.
Just a simple typo--missing a positional argument to CudaCompiler()
0c22798b1ad4678abb205280060175678a790c4a is the first bad commit File
"meson\mesonbuild\environment.py", line 1066, in detect_cuda_compiler
return CudaCompiler(ccache + compiler, version, for_machine, is_cross, exe_wrap, host_compiler=cpp_compiler,
linker=linker)# Please enter the commit message for your changes. Lines starting
TypeError: __init__() missing 1 required positional argument: 'info'# with '#' will be ignored, and an empty message aborts the commit.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 9a97454..3ee6d7d 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -1036,6 +1036,7 @@ class Environment: popen_exceptions = {} is_cross = not self.machines.matches_build_machine(for_machine) compilers, ccache, exe_wrap = self._get_compilers('cuda', for_machine) + info = self.machines[for_machine] for compiler in compilers: if isinstance(compiler, str): compiler = [compiler] @@ -1065,7 +1066,7 @@ class Environment: version = out.strip().split('V')[-1] cpp_compiler = self.detect_cpp_compiler(for_machine) linker = CudaLinker(compiler, for_machine, 'nvlink', CudaCompiler.LINKER_PREFIX, version=CudaLinker.parse_version()) - return CudaCompiler(ccache + compiler, version, for_machine, is_cross, exe_wrap, host_compiler=cpp_compiler, linker=linker) + return CudaCompiler(ccache + compiler, version, for_machine, is_cross, exe_wrap, host_compiler=cpp_compiler, info=info, linker=linker) raise EnvironmentException('Could not find suitable CUDA compiler: "' + ' '.join(compilers) + '"') def detect_fortran_compiler(self, for_machine: MachineChoice): |