Skip to content

Fix build on i686-apple-darwin systems #95375

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

Merged
merged 2 commits into from
Mar 29, 2022

Conversation

MarcusCalhoun-Lopez
Copy link
Contributor

Replace target_arch = "x86_64" with not(target_arch = "aarch64") so that i686-apple-darwin systems dynamically choose implementation.

@rust-highfive
Copy link
Contributor

r? @m-ou-se

(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 Mar 27, 2022
Replace `target_arch = "x86_64"` with `not(target_arch = "aarch64")` so that i686-apple-darwin systems dynamically choose implementation.
On 32-bit systems, fdopendir is called `_fdopendir$INODE64$UNIX2003`.
On 64-bit systems, fdopendir is called `_fdopendir$INODE64`.
@m-ou-se
Copy link
Member

m-ou-se commented Mar 29, 2022

Thanks!

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 29, 2022

📌 Commit 8c18844 has been approved by m-ou-se

@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 Mar 29, 2022
@m-ou-se m-ou-se added O-macos Operating system: macOS S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 29, 2022
@bors
Copy link
Collaborator

bors commented Mar 29, 2022

⌛ Testing commit 8c18844 with merge e2301ca...

@bors
Copy link
Collaborator

bors commented Mar 29, 2022

☀️ Test successful - checks-actions
Approved by: m-ou-se
Pushing e2301ca to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 29, 2022
@bors bors merged commit e2301ca into rust-lang:master Mar 29, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 29, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e2301ca): comparison url.

Summary: This benchmark run did not return any relevant results. 4 results were found to be statistically significant but too small to be relevant.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@MarcusCalhoun-Lopez MarcusCalhoun-Lopez deleted the i686_apple_darwin branch April 15, 2022 07:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. O-macos Operating system: macOS S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants