diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-10-11 22:23:05 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-10-11 22:23:05 +0300 |
| commit | 7c9c03b43078c67b3bee3babf03bdbdf4aba426a (patch) | |
| tree | 38c3ca2c86d3f6fe6093fa11d906e20e77ab61d5 /ninjabackend.py | |
| parent | 606dfed39f25e73de665a10c6a8dc052da0f01f6 (diff) | |
| download | meson-7c9c03b43078c67b3bee3babf03bdbdf4aba426a.zip meson-7c9c03b43078c67b3bee3babf03bdbdf4aba426a.tar.gz meson-7c9c03b43078c67b3bee3babf03bdbdf4aba426a.tar.bz2 | |
A few Rust fixes.
Diffstat (limited to 'ninjabackend.py')
| -rw-r--r-- | ninjabackend.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index e011848..0c1d3ba 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -818,7 +818,7 @@ class NinjaBackend(backends.Backend): for i in target.get_sources(): if not rustc.can_compile(i): raise InvalidArguments('Rust target %s contains a non-rust source file.' % target.get_basename()) - relsrc.append(os.path.join(self.build_to_src, i)) + relsrc.append(i.rel_to_builddir(self.build_to_src)) target_name = os.path.join(target.subdir, target.get_filename()) args = ['--crate-type'] if isinstance(target, build.Executable): @@ -833,7 +833,7 @@ class NinjaBackend(backends.Backend): args += rustc.get_buildtype_args(self.environment.coredata.buildtype) depfile = target_name + '.d' args += ['--out-dir', target.subdir] - args += ['--dep-info', depfile] + args += ['--emit', 'dep-info', '--emit', 'link'] orderdeps = [os.path.join(t.subdir, t.get_filename()) for t in target.link_targets] linkdirs = {} for d in target.link_targets: |