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

Remove the install prefix from the rpath set when using -Crpath #86025

Merged
merged 2 commits into from
Jun 7, 2021

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Jun 5, 2021

It was broken anyway for rustup installs and nobody seems to have noticed.

Fixes #82392

bjorn3 added 2 commits June 5, 2021 16:42
CFG_PREFIX is incorrect for rustup installed rustc versions. It also
causes unnecessary recompilation when changing the install prefix.
It was broken anyway for rustup installs and nobody seems to have noticed.
@bjorn3 bjorn3 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. A-linkage Area: linking into static, shared libraries and binaries T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 5, 2021
@rust-highfive
Copy link
Collaborator

r? @jackh726

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 5, 2021
@jackh726
Copy link
Member

jackh726 commented Jun 6, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Jun 6, 2021

📌 Commit 6b45d59 has been approved by jackh726

@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 Jun 6, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2021
Rollup of 6 pull requests

Successful merges:

 - rust-lang#84262 (Fix ICE during type layout when there's a `[type error]`)
 - rust-lang#85973 (Replace a `match` with an `if let`)
 - rust-lang#85996 (rustbuild: take changes to the standard library into account for `download-rustc`)
 - rust-lang#86016 (Unify duplicate linker_and_flavor methods in rustc_codegen_{cranelift,ssa}.)
 - rust-lang#86025 (Remove the install prefix from the rpath set when using -Crpath)
 - rust-lang#86081 (Use `try_into` instead of asserting manually)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fa38fad into rust-lang:master Jun 7, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jun 7, 2021
@bjorn3 bjorn3 deleted the no_rpath_cfg_prefix branch June 7, 2021 11:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-linkage Area: linking into static, shared libraries and binaries C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The build prefix is part of the compiled compiler
5 participants