diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-11-14 13:47:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-14 13:47:39 +0200 |
| commit | 299a67781e8330e110bd2aee76464ac6b755322c (patch) | |
| tree | 8772aa52e79947a60a22b2a034a46f9b0da37f8a /mesonbuild/backend | |
| parent | 8dcc7d3ef3cb95029c41a0d4accef86415f29cb8 (diff) | |
| parent | 6ce3812762405393d912ca8f222fa86cb2d6bed3 (diff) | |
| download | meson-299a67781e8330e110bd2aee76464ac6b755322c.zip meson-299a67781e8330e110bd2aee76464ac6b755322c.tar.gz meson-299a67781e8330e110bd2aee76464ac6b755322c.tar.bz2 | |
Merge pull request #7843 from dcbaker/submit/rustc-fixes
A few fixups for rust
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 1ed742b..c3c5705 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1489,7 +1489,7 @@ int dummy; self.create_target_source_introspection(target, valac, args, all_files, []) return other_src[0], other_src[1], vala_c_src - def generate_rust_target(self, target): + def generate_rust_target(self, target: build.BuildTarget) -> None: rustc = target.compilers['rust'] # Rust compiler takes only the main file as input and # figures out what other files are needed via import @@ -1539,7 +1539,8 @@ int dummy; depfile = os.path.join(target.subdir, target.name + '.d') args += ['--emit', 'dep-info={}'.format(depfile), '--emit', 'link'] args += target.get_extra_args('rust') - args += ['-o', os.path.join(target.subdir, target.get_filename())] + args += rustc.get_output_args(os.path.join(target.subdir, target.get_filename())) + args += self.environment.coredata.get_external_args(target.for_machine, rustc.language) orderdeps = [os.path.join(t.subdir, t.get_filename()) for t in target.link_targets] linkdirs = OrderedDict() for d in target.link_targets: |