Skip to content

add solaris rustbuild support #39759

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Feb 13, 2017
Merged

add solaris rustbuild support #39759

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee54be3
Add Solaris as recognized ostype
binarycrusader Feb 11, 2017
33b655e
fix copy pasta
binarycrusader Feb 12, 2017
4a618fe
fix exception handling for isainfo execution failure
binarycrusader Feb 12, 2017
3807e1f
fix portability issue in error handling of build_triple
binarycrusader Feb 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix portability issue in error handling of build_triple
  • Loading branch information
@binarycrusader
binarycrusader committed Feb 12, 2017
commit 3807e1f393e3022dcf686e2109eda1fb34eb22c9
2 changes: 1 addition & 1 deletion src/bootstrap/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def build_triple(self):
try:
ostype = subprocess.check_output(['uname', '-s']).strip().decode(default_encoding)
cputype = subprocess.check_output(['uname', '-m']).strip().decode(default_encoding)
except subprocess.CalledProcessError:
except (subprocess.CalledProcessError, OSError):
if sys.platform == 'win32':
return 'x86_64-pc-windows-msvc'
err = "uname not found"
Expand Down