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

BugFix: M1 detection #8501

Merged
merged 1 commit into from
Feb 16, 2021
Merged

BugFix: M1 detection #8501

merged 1 commit into from
Feb 16, 2021

Conversation

SSE4
Copy link
Contributor

@SSE4 SSE4 commented Feb 15, 2021

closes: #8499
continues story in #8113
it turns out the function _detect_os_arch (part of the detect_defaults_settings) didn't use detected_architecture and used its own mapping.
I guess it's better to have changes unified, done within a single place, so it's harder to forget to update both functions (like in the case of M1).

another confusing thing was:

ERROR: Your ARM 'arm64' architecture is probably not defined in settings.yml
Please check your conan.conf and settings.yml files

which emitted the error event after arm64 was added to the settings.yml. I also corrected that, so the function always loads the settings. (to be honest, I am not even sure the error message is needed at all, as it doesn't play nice with custom settings).

Changelog: BugFix: Fix Apple M1 detection.
Docs: omit

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

Signed-off-by: SSE4 <tomskside@gmail.com>
@memsharded memsharded added this to the 1.34 milestone Feb 15, 2021
Copy link
Contributor

@jgsogo jgsogo left a comment

Choose a reason for hiding this comment

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

Nice addition and refactor!

@jgsogo jgsogo merged commit e63953e into conan-io:develop Feb 16, 2021
bilke added a commit to ufz/ogs that referenced this pull request Oct 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[bug] M1 architecture is incorrectly detected as "arm64" (should be "armv8")
3 participants