Disable additional inlining definitions when building for Apple ARM64 #365
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
tzakharko
force-pushed
the
fix-apple-aarch64
branch
2 times, most recently
from
03200b7
to
d402f13
Compare
macdrevx
reviewed
Dec 17, 2020
src/inlines.cpp
Outdated
| @@ -35,6 +35,9 @@ | |||
| // the stubs correctly at link time by itself | |||
| #if !defined(__CYGWIN__) | |||
|
|
|||
| // Same as above for Apple ARM64 platforms | |||
| #if !defined(__APPLE__) && !defined(__aarch64__) | |||
There was a problem hiding this comment.
Might it be better to say:
#if !(defined(__APPLE__) && defined(__aarch64__))
so that the change only applies to ARM64 Macs?
There was a problem hiding this comment.
Thanks for pointing this out! It should have been a || instead of &&, that's what I get doing things in a rush and not paying attention.
I have now changed the line as you suggest as it's definitely more readable.
… targets as they result in linker errors
tzakharko
force-pushed
the
fix-apple-aarch64
branch
from
d402f13
to
10d0acf
Compare
|
Thanks! |
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.
Fixes #353
The "fix" is simply to ignore the includes on the affected platforms, as it already done on Windows