Fix stat64 handling on Intel macOS #1897
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ad87ced fixed compilation for ARM64 macOS, but it broke builds on Intel macOS. Let's fix it by gating the changes from ad87ced behind `_DARWIN_FEATURE_ONLY_64_BIT_INODE`. This macro is defined whenever the ARM64 macOS fix is appropriate, but only after we've included `sys/cdefs.h`. This does mean that we're still using a deprecated API on Intel macOS 10.6+. I looked into avoiding this, but it seems to require more significant refactoring. It's not clear that these changes would be worth it given that Apple is slowly phasing out their Intel machines.
carlocab
commented
Jan 25, 2022
Comment on lines
+34
to
+37
| /* Needed for _DARWIN_FEATURE_ONLY_64_BIT_INODE check below. */ | ||
| #if defined(__APPLE__) | ||
| #include <sys/cdefs.h> | ||
| #endif |
There was a problem hiding this comment.
We can avoid this #include by checking for __aarch64__ instead of _DARWIN_FEATURE_ONLY_64_BIT_INODE, but an architecture check here seems a bit hacky. I'm willing to change it though if desired.
|
Build tested on Intel macOS 10.15-12, and ARM macOS 11-12 at Homebrew/homebrew-core#93683 (see Homebrew/homebrew-core@e7c88bf). Didn't run the test suite, though. |
6 tasks
|
Thanks for the quick fix! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ad87ced fixed compilation for ARM64 macOS, but it broke builds on Intel
macOS.
Let's fix it by gating the changes from ad87ced behind
_DARWIN_FEATURE_ONLY_64_BIT_INODE. This macro is defined whenever theARM64 macOS fix is appropriate, but only after we've included
sys/cdefs.h.This does mean that we're still using a deprecated API on Intel macOS
10.6+. I looked into avoiding this, but it seems to require more
significant refactoring. It's not clear that more significant changes would be
worth it given that Apple is slowly phasing out their Intel machines.