diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-03-22 23:40:52 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-03-22 23:45:24 +0200 |
| commit | d5986d9e9d3629438965c6d79e7db16f69079d46 (patch) | |
| tree | 27ce2d5394693698d40649f2bf07892f47a6d0ac /mesonbuild/compilers | |
| parent | 4e5edff60f4874866d16e7ec43c5927b6af03f8c (diff) | |
| download | meson-rustwin.tar.gz | |
Fix setup so test suite runs with rustc + MSVC. Closes: 5099rustwin
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 1 | ||||
| -rw-r--r-- | mesonbuild/compilers/rust.py | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index ceefefeff..da029806e 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -61,7 +61,6 @@ c_suffixes = lang_suffixes['c'] + ('h',) clib_langs = ('objcpp', 'cpp', 'objc', 'c', 'fortran',) # List of languages that can be linked with C code directly by the linker # used in build.py:process_compilers() and build.py:get_dynamic_linker() -# XXX: Add Rust to this? clink_langs = ('d', 'cuda') + clib_langs clink_suffixes = () for _l in clink_langs + ('vala',): diff --git a/mesonbuild/compilers/rust.py b/mesonbuild/compilers/rust.py index 68da82361..410125ae3 100644 --- a/mesonbuild/compilers/rust.py +++ b/mesonbuild/compilers/rust.py @@ -93,3 +93,9 @@ class RustCompiler(Compiler): break return parameter_list + + def get_buildtype_linker_args(self, build_type): + return [] + + def get_std_exe_link_args(self): + return [] |