diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-01-03 17:56:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-03 17:56:23 +0900 |
| commit | 9dd2c9eae3c08c4742e84204243b70db4210a78c (patch) | |
| tree | 44ea4c60b0223e32a8e0b9c029e843594f873701 | |
| parent | 76c1454d27440dd6783bcc81b8558510a18130bf (diff) | |
| parent | 98d8326cfc0b20b20d161fe2830bcfe2072cfdfd (diff) | |
| download | rust-9dd2c9eae3c08c4742e84204243b70db4210a78c.tar.gz rust-9dd2c9eae3c08c4742e84204243b70db4210a78c.zip | |
Rollup merge of #67636 - semarie:bootstrap-rustfmt, r=Mark-Simulacrum
allow rustfmt key in [build] section Permit using `rustfmt` in `config.toml`. It will allow to not download `rustfmt` binary, which is not possible for at least some tiers-3 platforms. Fixes: #67624 r? @Mark-Simulacrum
| -rw-r--r-- | config.toml.example | 4 | ||||
| -rw-r--r-- | src/bootstrap/config.rs | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config.toml.example b/config.toml.example index f22f4a5a975..bfd9e18cdd4 100644 --- a/config.toml.example +++ b/config.toml.example @@ -138,6 +138,10 @@ # specified, use this rustc binary instead as the stage0 snapshot compiler. #rustc = "/path/to/bin/rustc" +# Instead of download the src/stage0.txt version of rustfmt specified, +# use this rustfmt binary instead as the stage0 snapshot rustfmt. +#rustfmt = "/path/to/bin/rustfmt" + # Flag to specify whether any documentation is built. If false, rustdoc and # friends will still be compiled but they will not be used to generate any # documentation. diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index ed65a606ff5..944df66431f 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -203,6 +203,7 @@ struct Build { target: Vec<String>, cargo: Option<String>, rustc: Option<String>, + rustfmt: Option<String>, /* allow bootstrap.py to use rustfmt key */ docs: Option<bool>, compiler_docs: Option<bool>, submodules: Option<bool>, |