Skip to content

Propagate RUSTDOCFLAGS in the environment when documenting - #82309

Merged
bors merged 1 commit into
rust-lang:masterfrom
jyn514:rustdocflags
Mar 1, 2021
Merged

Propagate RUSTDOCFLAGS in the environment when documenting#82309
bors merged 1 commit into
rust-lang:masterfrom
jyn514:rustdocflags

Conversation

@jyn514

Copy link
Copy Markdown
Member

Previously, RUSTDOCFLAGS would get overriden when bootstrap set
RUSTDOCFLAGS itself. Propagate the flag manually, using the same logic
as RUSTFLAGS.

Fixes#75256.

@jyn514jyn514 added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-contributor-roadblock Area: Makes things more difficult for new or seasoned contributors to Rust labels Feb 20, 2021
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 20, 2021
Comment threadsrc/bootstrap/builder.rs Outdated
@Mark-SimulacrumMark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 20, 2021
@jyn514jyn514 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 21, 2021
@rust-log-analyzer

This comment has been minimized.

Previously, RUSTDOCFLAGS would get overriden when bootstrap set
`RUSTDOCFLAGS` itself. Propagate the flag manually, using the same logic
as `RUSTFLAGS`.
This also extracts the logic into a helper function to make sure it's
the same.
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Mar 1, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 0238986 has been approved by Mark-Simulacrum

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 1, 2021
@JohnTitorJohnTitor mentioned this pull request Mar 1, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 1, 2021
Rollup of 10 pull requests
Successful merges:
- rust-lang#82309 (Propagate RUSTDOCFLAGS in the environment when documenting)
- rust-lang#82403 (rustbuild: print out env vars on verbose rustc invocations)
- rust-lang#82507 (Rename the `tidy` binary to `rust-tidy`)
- rust-lang#82531 (Add GUI tests)
- rust-lang#82532 (Add `build.print_step_rusage` to config.toml)
- rust-lang#82543 (fix env var name in CI)
- rust-lang#82622 (Propagate `--test-args` for `x.py test src/tools/cargo`)
- rust-lang#82628 (Try to clarify GlobalAlloc::realloc documentation comment.)
- rust-lang#82630 (Fix a typo in the `find_anon_type` doc)
- rust-lang#82643 (Add more proc-macro attribute tests)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 3de9b41 into rust-lang:masterMar 1, 2021
@rustbotrustbot added this to the 1.52.0 milestone Mar 1, 2021
@jyn514
jyn514 deleted the rustdocflags branch March 1, 2021 14:01
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-contributor-roadblockArea: Makes things more difficult for new or seasoned contributors to RustS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

There should be a rustdoc equivalent of RUSTFLAGS_NOT_BOOTSTRAP

6 participants

@jyn514@rust-highfive@rust-log-analyzer@Mark-Simulacrum@bors@rustbot