summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bootstrap/bootstrap.py4
-rwxr-xr-xx.py2
2 files changed, 3 insertions, 3 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'
diff --git a/x.py b/x.py
index 8f528889d60..e277ab98be1 100755
--- a/x.py
+++ b/x.py
@@ -9,7 +9,7 @@
# option. This file may not be copied, modified, or distributed
# except according to those terms.
-# This file is only a "symlink" to boostrap.py, all logic should go there.
+# This file is only a "symlink" to bootstrap.py, all logic should go there.
import os
import sys