summaryrefslogtreecommitdiff
path: root/mesonbuild/backend
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2024-11-20 13:42:14 +0100
committerEli Schwartz <eschwartz93@gmail.com>2025-02-03 20:01:37 -0500
commit39d5ffc27fe0dae50b0be10ed23cf54e05a6c38b (patch)
treef87df43adbcb82269321d42317937c9fbb805cfa /mesonbuild/backend
parent103501c2741f9ff919bc04a17cb057ace150526c (diff)
downloadmeson-39d5ffc27fe0dae50b0be10ed23cf54e05a6c38b.tar.gz
rust: stop using --out-dir, move depfile into private directory
Since the introduction of dep-info=... it is possible to move the depfile away from the main build directory without using --out-dir. This is less surprising, since the rules for mixing --emit, --out-dir and -o are not really documented. Reviewed-by: Dylan Baker <dylan@pnwbakers.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'mesonbuild/backend')
-rw-r--r--mesonbuild/backend/ninjabackend.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 4aadb12cb..cc3b9b3aa 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -2007,9 +2007,9 @@ class NinjaBackend(backends.Backend):
args += self.generate_basic_compiler_args(target, rustc)
# Rustc replaces - with _. spaces or dots are not allowed, so we replace them with underscores
args += ['--crate-name', target.name.replace('-', '_').replace(' ', '_').replace('.', '_')]
- depfile = os.path.join(target.subdir, target.name + '.d')
- args += ['--emit', f'dep-info={depfile}', '--emit', f'link={target_name}']
- args += ['--out-dir', self.get_target_private_dir(target)]
+ depfile = os.path.join(self.get_target_private_dir(target), target.name + '.d')
+ args += ['--emit', f'dep-info={depfile}']
+ args += ['--emit', f'link'={target_name}']
args += ['-C', 'metadata=' + target.get_id()]
args += target.get_extra_args('rust')