bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

some Python nits and fixes

Browse source
This commit is contained in:
Tshepang Lekhonkhobe 2016-04-21 23:07:51 +02:00
parent a264f5b7e8
commit a422b7e4ed
2 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/bootstrap/bootstrap.py
View file

@ -81,14 +81,15 @@ def run(args, verbose=False):
def stage0_data(rust_root):
nightlies = os.path.join(rust_root, "src/stage0.txt")
data = {}
with open(nightlies, 'r') as nightlies:
data = {}
for line in nightlies.read().split("\n"):
for line in nightlies:
line = line.rstrip() # Strip newline character, '\n'
if line.startswith("#") or line == '':
continue
a, b = line.split(": ", 1)
data[a] = b
return data
return data
class RustBuild:
def download_stage0(self):
@ -219,7 +220,7 @@ class RustBuild:
env)
def run(self, args, env):
proc = subprocess.Popen(args, env = env)
proc = subprocess.Popen(args, env=env)
ret = proc.wait()
if ret != 0:
sys.exit(ret)
@ -234,20 +235,19 @@ class RustBuild:
try:
ostype = subprocess.check_output(['uname', '-s']).strip()
cputype = subprocess.check_output(['uname', '-m']).strip()
except FileNotFoundError:
except subprocess.CalledProcessError:
if sys.platform == 'win32':
return 'x86_64-pc-windows-msvc'
else:
err = "uname not found"
if self.verbose:
raise Exception(err)
sys.exit(err)
err = "uname not found"
if self.verbose:
raise Exception(err)
sys.exit(err)
# Darwin's `uname -s` lies and always returns i386. We have to use
# sysctl instead.
if ostype == 'Darwin' and cputype == 'i686':
sysctl = subprocess.check_output(['sysctl', 'hw.optional.x86_64'])
if sysctl.contains(': 1'):
if ': 1' in sysctl:
cputype = 'x86_64'
# The goal here is to come up with the same triple as LLVM would,