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

Add support for Solaris sparc and x86. #5630

Merged
merged 2 commits into from Aug 19, 2019
Merged

Conversation

@datalogics-robb
Copy link
Contributor

@datalogics-robb datalogics-robb commented Aug 14, 2019

Changelog: Bugfix: Fix system detection on Solaris.

Docs: Omit

Issue: #5629

Under Solaris, platform.machine() returns strings that Conan was not expecting. In this PR code is added to handle Solaris OS first, as on Intel Solaris the string returned is "i86pc" this would return "x86" rather than the 64-bit architecture "x86_64".

@CLAassistant
Copy link

@CLAassistant CLAassistant commented Aug 14, 2019

CLA assistant check
All committers have signed the CLA.

@danimtb danimtb self-assigned this Aug 16, 2019
@danimtb
Copy link
Member

@danimtb danimtb commented Aug 16, 2019

Looking good from my side. We will have to check if this could be merged for next month release. Thanks!

@lasote lasote added this to the 1.19 milestone Aug 19, 2019
@lasote
Copy link
Contributor

@lasote lasote commented Aug 19, 2019

Looks good. I'm merging this and will open a small one refactoring some duplicated code in the detect module for AIX and incorporating these changes.

@lasote lasote merged commit 0e0baa0 into conan-io:develop Aug 19, 2019
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants