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

rust: restore mis-deleted patch hunk #23581

Closed
wants to merge 1 commit into from
Closed

Conversation

krant
Copy link
Contributor

@krant krant commented Mar 4, 2024

Maintainer: @lu-zero
Compile tested: Atheros ATH79

Description:
Those lines were erroneously deleted in commit dccb910 during manual rebase.
Thanks to @1715173329 for finding it out.

@krant krant mentioned this pull request Mar 4, 2024

let cache_prefix = format!("llvm-{llvm_sha}-{llvm_assertions}");
- let cache_dst = self.out.join("cache");
+ let cache_dst = match env::var_os("OPENWRT_RUSTC_BOOTSTRAP_CACHE") {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably it is better to upstream the feature with a generic name so it won't be a problem in the future...

I'll try to do that this evening if nobody beats me at it :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jefferyto already created a PR for it: rust-lang/rust#116697
But I think he is busy these months...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for reminding me, let me see if I can bake a newer one based on the review comment.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I rebased and addressed a suggestion rust-lang/rust#121976

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It landed rust-lang/rust#121976 shall we use it now or wait for the next release?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shall we use it now

Sounds great ;)

It was erroneously deleted in commit dccb910 during manual rebase.

Signed-off-by: krant <aleksey.vasilenko@gmail.com>
@krant
Copy link
Contributor Author

krant commented Mar 24, 2024

superseded in #23734

@krant krant closed this Mar 24, 2024
@krant krant deleted the rust branch April 7, 2024 13:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants