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

Fix x test lint-docs linkchecker when download-rustc is enabled #110521

Merged
merged 1 commit into from
Apr 19, 2023

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Apr 19, 2023

Bootstrap was setting LD_LIBRARY_PATH for bootstrap tools in tool_cmd, and rustc inherited that environment. That broke when download-rustc was enabled; see the new comment for details.

Fixes #110354

Bootstrap was setting LD_LIBRARY_PATH for bootstrap tools in `tool_cmd`,
and rustc inherited that environment. That broke when download-rustc was
enabled; see the new comment for details.
@rustbot
Copy link
Collaborator

rustbot commented Apr 19, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 19, 2023
@jyn514 jyn514 added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-download-rustc Area: The `rust.download-rustc` build option. labels Apr 19, 2023
@albertlarsan68
Copy link
Member

Thanks for the PR!
@bors rollup
r=me when CI green
r? @albertlarsan68

@albertlarsan68
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 19, 2023

📌 Commit abf9cbc has been approved by albertlarsan68

It is now in the queue for this repository.

@bors bors 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 Apr 19, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 19, 2023
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#110123 ('./configure' now checks if 'config.toml' exists before writing to that destination)
 - rust-lang#110429 (Spelling src bootstrap)
 - rust-lang#110430 (Spelling src ci)
 - rust-lang#110515 (Don't special-case download-rustc in `maybe_install_llvm`)
 - rust-lang#110521 (Fix `x test lint-docs linkchecker` when download-rustc is enabled)
 - rust-lang#110525 (Fix `tests/run-make-translation` when download-rustc is enabled)
 - rust-lang#110531 (small type system cleanup)
 - rust-lang#110533 (Missing blanket impl trait not public)
 - rust-lang#110540 (Fix wrong comment in rustc_hir/src/hir.rs)
 - rust-lang#110541 (Fix various configure bugs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1de29ac into rust-lang:master Apr 19, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 19, 2023
@jyn514 jyn514 deleted the test-lint-docs branch April 20, 2023 15:54
@cuviper
Copy link
Member

cuviper commented Jul 10, 2023

Unsetting LD_LIBRARY_PATH "when download-rustc is enabled" seems fine, but the PR is actually doing this unconditionally. This is breaking my distro test builds when I'm trying the upcoming 1.71, because we build without rpath and it can't find its libraries anymore.

For now I can just revert this commit in my builds, but do you have any thoughts how it should be solved long-term?

@jyn514
Copy link
Member Author

jyn514 commented Jul 10, 2023

i misunderstood the problem when i made this change. it was a combination of #110474 and not respecting llvm.assertions when download-rustc was enabled. #110490 fixed the former and #113373 will fix the latter; i'll revert this change as part of #113373.

@cuviper
Copy link
Member

cuviper commented Jul 10, 2023

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-download-rustc Area: The `rust.download-rustc` build option. A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant 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.

x test src/tools/lint-docs fails when download-rustc is enabled
6 participants