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.

Sign up for GitHub

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

Jump to bottom

Skip rustc version detection on macOS #110909

Merged
merged 2 commits into from
Apr 28, 2023
Merged

Skip rustc version detection on macOS #110909

merged 2 commits into from
Apr 28, 2023

Conversation

john-h-k
Copy link
Contributor

Fixes #104723

@rustbot
Copy link
Collaborator

rustbot commented Apr 27, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @albertlarsan68 (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Apr 27, 2023
@jyn514
Copy link
Member

jyn514 commented Apr 27, 2023

@john-h-k have you tested locally that this fixes the problem? do you have a MacBook?

jyn514
jyn514 reviewed Apr 27, 2023
View reviewed changes
src/bootstrap/bootstrap.py Outdated Show resolved Hide resolved
@john-h-k
Copy link
Contributor Author

Yes, am on M1 Max, and can confirm it resolves the issue for me

@jyn514
Copy link
Member

jyn514 commented Apr 27, 2023

thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 27, 2023

📌 Commit cffc10b has been approved by jyn514

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 27, 2023
@JohnTitor JohnTitor mentioned this pull request Apr 28, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 28, 2023
@bors
Auto merge of rust-lang#110919 - JohnTitor:rollup-9phs2vx, r=JohnTitor
033aa09 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#109702 (configure --set support list as arguments)
 - rust-lang#110620 (Document `const {}` syntax for `std::thread_local`.)
 - rust-lang#110721 (format panic message only once)
 - rust-lang#110881 (refactor(docs): remove macro resolution fallback)
 - rust-lang#110893 (remove inline const deadcode in typeck)
 - rust-lang#110898 (Remove unused std::sys_common::thread_local_key::Key)
 - rust-lang#110909 (Skip `rustc` version detection on macOS)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 00b9ce5 into rust-lang:master Apr 28, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 left review comments

Assignees

@albertlarsan68 albertlarsan68

Labels
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
Milestone
1.71.0
Development

Successfully merging this pull request may close these issues.

bootstrap should not use rustc --version to detect the build triple on on Mac Apple Silicon M1 arm64
5 participants
@john-h-k @rustbot @jyn514 @bors @albertlarsan68