about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorTitus Barik <titus@barik.net>2017-04-30 16:10:31 -0400
committerTitus Barik <titus@barik.net>2017-04-30 16:10:31 -0400
commit04e4d426a169a26d498bf22d2c2d01bc7b14fbcd (patch)
treef377e41549b1dff7b36d5d794b702cd120cdc0f8 /src
parent06fb4d25642a3f223db1441972dd5962085cfba1 (diff)
downloadrust-04e4d426a169a26d498bf22d2c2d01bc7b14fbcd.tar.gz
rust-04e4d426a169a26d498bf22d2c2d01bc7b14fbcd.zip
Rename os variable in bootstrap.py to avoid shadowing os module.
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/bootstrap.py4
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'