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

[macOS] Fix crash handler not printing function names on M1 Macs. #55019

Merged
merged 1 commit into from
Nov 16, 2021

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Nov 16, 2021

Fixes incorrect architecture name used to call atos.

@bruvzg bruvzg added this to the 4.0 milestone Nov 16, 2021
@bruvzg bruvzg requested a review from a team as a code owner November 16, 2021 06:34
args.push_back("x86_64");
#elif defined(__aarch64__)
args.push_back("arm64");
Copy link
Member

Choose a reason for hiding this comment

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

That shouldn't happen, but in theory of new arches were added then the call would become invalid as there's no #else condition. Maybe it should raise an error in #else?

Or is it mandatory to set the arch, or can we get away with just letting it infer things?

Copy link
Member Author

Choose a reason for hiding this comment

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

Moved args.push_back("-arch"); into the ifdef, it's an optional flag. This way it should try to infer architecture if we do not know it.

@bruvzg bruvzg force-pushed the macos_crash_handler branch from f27d4ef to c8037ef Compare November 16, 2021 06:45
@akien-mga akien-mga merged commit 7791599 into godotengine:master Nov 16, 2021
@akien-mga
Copy link
Member

Thanks!

@bruvzg bruvzg deleted the macos_crash_handler branch November 17, 2021 06:23
@bruvzg bruvzg added the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Dec 8, 2021
@bruvzg
Copy link
Member Author

bruvzg commented Dec 8, 2021

This fix is relevant for 3.x as well.

@akien-mga
Copy link
Member

Cherry-picked for 3.5.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Dec 8, 2021
@akien-mga
Copy link
Member

Cherry-picked for 3.4.1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants