diff options
| author | bors <bors@rust-lang.org> | 2017-05-02 14:56:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-02 14:56:11 +0000 |
| commit | ed1f26ddda15b2bcf613a257e813e8b02ee14dff (patch) | |
| tree | 4bc9cd842d2113827d984404610e91f183dd62bd /src/bootstrap | |
| parent | 96e2c34286099eea4f51daaadbb82a8fbe99e0f6 (diff) | |
| parent | e0bfd19add662c07eb102818ce579315ddc90094 (diff) | |
| download | rust-ed1f26ddda15b2bcf613a257e813e8b02ee14dff.tar.gz rust-ed1f26ddda15b2bcf613a257e813e8b02ee14dff.zip | |
Auto merge of #41702 - frewsxcv:rollup, r=frewsxcv
Rollup of 6 pull requests - Successful merges: #41661, #41662, #41673, #41688, #41692, #41693 - Failed merges:
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 2bccdef9b0a..ad3cf31c1b9 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -414,8 +414,8 @@ class RustBuild(object): # The goal here is to come up with the same triple as LLVM would, # at least for the subset of platforms we're willing to target. if ostype == 'Linux': - os = subprocess.check_output(['uname', '-o']).strip().decode(default_encoding) - if os == 'Android': + os_from_sp = subprocess.check_output(['uname', '-o']).strip().decode(default_encoding) + if os_from_sp == 'Android': ostype = 'linux-android' else: ostype = 'unknown-linux-gnu' |