mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename os variable in bootstrap.py to avoid shadowing os module.

Browse source
This commit is contained in:
Titus Barik 2017-04-30 16:10:31 -04:00
parent 06fb4d2564
commit 04e4d426a1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bootstrap/bootstrap.py
View file

@ -414,8 +414,8 @@ class RustBuild(object):
# The goal here is to come up with the same triple as LLVM would, # 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. # at least for the subset of platforms we're willing to target.
if ostype == 'Linux': if ostype == 'Linux':
os = subprocess.check_output(['uname', '-o']).strip().decode(default_encoding) os_from_sp = subprocess.check_output(['uname', '-o']).strip().decode(default_encoding)
if os == 'Android': if os_from_sp == 'Android':
ostype = 'linux-android' ostype = 'linux-android'
else: else:
ostype = 'unknown-linux-gnu' ostype = 'unknown-linux-gnu'

2
x.py
View file

@ -9,7 +9,7 @@
# option. This file may not be copied, modified, or distributed # option. This file may not be copied, modified, or distributed
# except according to those terms. # 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 os
import sys import sys