diff options
| author | bors <bors@rust-lang.org> | 2023-12-25 12:31:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-12-25 12:31:34 +0000 |
| commit | 13ea97cb14f19396ba880de53bbefb39f18d8397 (patch) | |
| tree | 5c0fb7408acbbc8af3b96003c14f879297319423 | |
| parent | f2348fb29a49d1bd4b62531a36c685f1961a8f46 (diff) | |
| parent | c350d3c5dd00ed0727ffe72fc33637d8c7537733 (diff) | |
| download | rust-13ea97cb14f19396ba880de53bbefb39f18d8397.tar.gz rust-13ea97cb14f19396ba880de53bbefb39f18d8397.zip | |
Auto merge of #119292 - onur-ozkan:share-make-with-rustdoc, r=albertlarsan68
bootstrap: use same make flags with rustdoc Keeping same `MAKEFLAGS` and `MFLAGS` for rustdoc should allow rustdoc to use the same jobserver.
| -rw-r--r-- | src/bootstrap/src/core/builder.rs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs index 56bdc9aaef1..753b41abaf4 100644 --- a/src/bootstrap/src/core/builder.rs +++ b/src/bootstrap/src/core/builder.rs @@ -1221,11 +1221,6 @@ impl<'a> Builder<'a> { cmd.arg("-Dwarnings"); } cmd.arg("-Znormalize-docs"); - - // Remove make-related flags that can cause jobserver problems. - cmd.env_remove("MAKEFLAGS"); - cmd.env_remove("MFLAGS"); - cmd.args(linker_args(self, compiler.host, LldThreads::Yes)); cmd } |
