Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 12 pull requests #85705

Closed
wants to merge 25 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1aa6307
Support pretty printing slices using GDB
EFanZh May 18, 2021
e587366
doc: clarify Mutex::try_lock, etc. errors
tlyu May 20, 2021
903e369
Fix boostrap using host exe suffix for cargo
jam1garner May 22, 2021
d7341f3
Don't reborrow self when computing the dest pointer in <[T]>::copy_wi…
SkiFire13 May 23, 2021
db8c6e0
Remove stray .stderr files
LeSeulArtichaut May 24, 2021
0e4f8cb
minor rewording after review
tlyu May 24, 2021
b63f7f9
Demote ControlFlow::{from|into}_try to pub(crate)
scottmcm May 24, 2021
ad30826
Revert "Move llvm submodule updates to rustbuild"
Mark-Simulacrum May 24, 2021
37588e9
Document shared_from_cow functions
fee1-dead May 25, 2021
79a5b12
Fix tasklist example in rustdoc book.
ehuss May 25, 2021
87cf2d4
Move stability attribute for methods under the `ip` feature from the …
CDirkx May 25, 2021
072b85c
Update books
ehuss May 25, 2021
8a7dc0d
Update cargo
ehuss May 25, 2021
5221548
Rollup merge of #85363 - EFanZh:gdb-pretty-print-slices, r=Mark-Simul…
JohnTitor May 26, 2021
5d6581f
Rollup merge of #85529 - tlyu:trylock-errors, r=JohnTitor
JohnTitor May 26, 2021
75fced3
Rollup merge of #85590 - jam1garner:tool-bootstrap-su-fix, r=Mark-Sim…
JohnTitor May 26, 2021
473e8ba
Rollup merge of #85610 - SkiFire13:fix-copy-within-provenance, r=oli-obk
JohnTitor May 26, 2021
61bcdee
Rollup merge of #85623 - LeSeulArtichaut:stray-stderr, r=Mark-Simulacrum
JohnTitor May 26, 2021
308c13d
Rollup merge of #85645 - scottmcm:demote-from-into-try, r=yaahc
JohnTitor May 26, 2021
dfef0c1
Rollup merge of #85647 - rust-lang:revert-81601-llvm-on-demand, r=jyn514
JohnTitor May 26, 2021
dcd13ef
Rollup merge of #85666 - fee1-dead:document-shared-from-cow, r=dtolnay
JohnTitor May 26, 2021
d75f0e5
Rollup merge of #85668 - ehuss:fix-rustdoc-tasklist, r=Mark-Simulacrum
JohnTitor May 26, 2021
a6a7d21
Rollup merge of #85672 - CDirkx:ip, r=Mark-Simulacrum
JohnTitor May 26, 2021
2a8cf56
Rollup merge of #85699 - ehuss:update-books, r=ehuss
JohnTitor May 26, 2021
6582cf5
Rollup merge of #85701 - ehuss:update-cargo, r=ehuss
JohnTitor May 26, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix boostrap using host exe suffix for cargo
  • Loading branch information
jam1garner committed May 22, 2021
commit 903e369c831d52726a5292f847e384622189d9a0
5 changes: 2 additions & 3 deletions src/bootstrap/tool.rs
Original file line number Diff line number Diff line change
@@ -217,9 +217,8 @@ impl Step for ToolBuild {
if tool == "tidy" {
tool = "rust-tidy";
}
let cargo_out =
builder.cargo_out(compiler, self.mode, target).join(exe(tool, compiler.host));
let bin = builder.tools_dir(compiler).join(exe(tool, compiler.host));
let cargo_out = builder.cargo_out(compiler, self.mode, target).join(exe(tool, target));
let bin = builder.tools_dir(compiler).join(exe(tool, target));
builder.copy(&cargo_out, &bin);
Some(bin)
}