diff options
| author | bors <bors@rust-lang.org> | 2024-12-01 13:09:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-01 13:09:56 +0000 |
| commit | ca4e54f032a49a23883c429ab34911ed856973c2 (patch) | |
| tree | c0a3d8f39ac811efb12f29eac5a8f242d98fb0dc /src/bootstrap/bootstrap.py | |
| parent | 6c76ed5503966c39381fac64eb905ac45e346695 (diff) | |
| parent | dd2ac08cfefd66cf827b1ced863d98cc7f09d279 (diff) | |
| download | rust-ca4e54f032a49a23883c429ab34911ed856973c2.tar.gz rust-ca4e54f032a49a23883c429ab34911ed856973c2.zip | |
Auto merge of #132390 - RalfJung:diagnostics-root-dir, r=albertlarsan68,weihanglo
bootstrap: show diagnostics relative to rustc src dir Fixes https://github.com/rust-lang/rust/issues/128726 Depends on https://github.com/rust-lang/cargo/pull/14752 propagating to bootstrap cargo
Diffstat (limited to 'src/bootstrap/bootstrap.py')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index d7ae0299dd6..762f4e653e9 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -1029,7 +1029,8 @@ class RustBuild(object): raise Exception("no cargo executable found at `{}`".format( self.cargo())) args = [self.cargo(), "build", "--manifest-path", - os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] + os.path.join(self.rust_root, "src/bootstrap/Cargo.toml"), + "-Zroot-dir="+self.rust_root] args.extend("--verbose" for _ in range(self.verbose)) if self.use_locked_deps: args.append("--locked") |