diff options
| author | bors <bors@rust-lang.org> | 2020-06-16 14:58:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-16 14:58:14 +0000 |
| commit | a647c0cd68bdd0f15081019f0b21bc31ae23f072 (patch) | |
| tree | 2e5ec96c4bbeedd4a6951c61505e2dd517037b21 /src/bootstrap | |
| parent | 435f97cec1f0d7de95a0b80e95f295ab444b2fce (diff) | |
| parent | b4dd6a0dc43f85d9fcd9cfaf45a5c5d854ee13ae (diff) | |
Auto merge of #73402 - Dylan-DPC:rollup-8udzpfu, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #73237 (Check for overflow in DroplessArena and align returned memory) - #73339 (Don't run generator transform when there's a TyErr) - #73372 (Re-order correctly the sections in the sidebar) - #73373 (Use track caller for bug! macro) - #73380 (Add more info to `x.py build --help` on default value for `-j JOBS`.) - #73381 (Fix typo in docs of std::mem) - #73389 (Use `Ipv4Addr::from<[u8; 4]>` when possible) - #73400 (Fix forge-platform-support URL) Failed merges: r? @ghost
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/flags.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs index cfaa43f3970..37261153574 100644 --- a/src/bootstrap/flags.rs +++ b/src/bootstrap/flags.rs @@ -149,7 +149,12 @@ To learn more about a subcommand, run `./x.py <subcommand> -h`", "N", ); opts.optopt("", "src", "path to the root of the rust checkout", "DIR"); - opts.optopt("j", "jobs", "number of jobs to run in parallel", "JOBS"); + let j_msg = format!( + "number of jobs to run in parallel; \ + defaults to {} (this host's logical CPU count)", + num_cpus::get() + ); + opts.optopt("j", "jobs", &j_msg, "JOBS"); opts.optflag("h", "help", "print this help message"); opts.optopt( "", |