diff options
| author | bors <bors@rust-lang.org> | 2022-09-17 22:04:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-17 22:04:28 +0000 |
| commit | 5253b0a0a1f366fad0ebed57597fcf2703b9e893 (patch) | |
| tree | 8111bda03a6a21e62ba5c5ae16ac54619f21cbd1 /src/bootstrap/bootstrap.py | |
| parent | 98ad6a5519651af36e246c0335c964dd52c554ba (diff) | |
| parent | 5ba52ca002bd1ee2d7f9fe1969c21e8faaf9edac (diff) | |
| download | rust-5253b0a0a1f366fad0ebed57597fcf2703b9e893.tar.gz rust-5253b0a0a1f366fad0ebed57597fcf2703b9e893.zip | |
Auto merge of #101949 - matthiaskrgr:rollup-xu5cqnd, r=matthiaskrgr
Rollup of 7 pull requests
Successful merges:
- #101093 (Initial version of 1.64 release notes)
- #101713 (change AccessLevels representation)
- #101821 (Bump Unicode to version 15.0.0, regenerate tables)
- #101826 (Enforce "joined()" and "joined_with_noop()" test)
- #101835 (Allow using vendoring when running bootstrap from outside the source root)
- #101942 (Revert "Copy stage0 binaries into stage0-sysroot")
- #101943 (rustdoc: remove unused CSS `.non-exhaustive { margin-bottom }`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
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 350d87d58a4..57128685d91 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -778,7 +778,8 @@ class RustBuild(object): elif color == "never": args.append("--color=never") - run(args, env=env, verbose=self.verbose) + # Run this from the source directory so cargo finds .cargo/config + run(args, env=env, verbose=self.verbose, cwd=self.rust_root) def build_triple(self): """Build triple as in LLVM |