Merge pull request #8355 from obilaniu/cudafixes

CUDA Compiler Fixes
mesonbuild · Feb 17, 2021 · 7812cee · 7812cee
2 parents f3727c6 + 3410465
commit 7812cee
Show file tree

Hide file tree

Showing 5 changed files with 419 additions and 41 deletions.
diff --git a/docs/markdown/Builtin-options.md b/docs/markdown/Builtin-options.md
@@ -194,6 +194,7 @@ or compiler being used:
 | cpp_thread_count | 4             | integer value ≥ 0                        | Number of threads to use with emcc when using threads |
 | cpp_winlibs      | see below     | free-form comma-separated list           | Standard Windows libs to link against |
 | fortran_std      | none          | [none, legacy, f95, f2003, f2008, f2018] | Fortran language standard to use |
+| cuda_ccbindir    |               | filesystem path                          | CUDA non-default toolchain directory to use (-ccbin) *(Added in 0.57.1)* |
 
 The default values of `c_winlibs` and `cpp_winlibs` are in
 compiler-specific argument forms, but the libraries are: kernel32,

diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
@@ -175,8 +175,8 @@ class CompileCheckMode(enum.Enum):
 
 
 cuda_buildtype_args = {'plain': [],
-                       'debug': [],
-                       'debugoptimized': [],
+                       'debug': ['-g', '-G'],
+                       'debugoptimized': ['-g', '-lineinfo'],
                        'release': [],
                        'minsize': [],
                        'custom': [],