OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix x.py

Browse Source
This commit is contained in:
Simonas Kazlauskas 2017-05-18 21:22:15 +03:00
parent 0ed1ec9f9e
commit c5163aadc5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bootstrap/bootstrap.py
View File

@ -398,13 +398,14 @@ class RustBuild(object):
sys.exit(ret) sys.exit(ret)
def output(self, args, env=None, cwd=None): def output(self, args, env=None, cwd=None):
default_encoding = sys.getdefaultencoding()
proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env, cwd=cwd) proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env, cwd=cwd)
(out, err) = proc.communicate() (out, err) = proc.communicate()
ret = proc.wait() ret = proc.wait()
if ret != 0: if ret != 0:
print(out) print(out)
sys.exit(ret) sys.exit(ret)
return out return out.decode(default_encoding)
def build_triple(self): def build_triple(self):
default_encoding = sys.getdefaultencoding() default_encoding = sys.getdefaultencoding()
@ -570,10 +571,10 @@ class RustBuild(object):
for submod in submodules: for submod in submodules:
path, status = submod path, status = submod
if path.endswith(b"llvm") and \ if path.endswith('llvm') and \
(self.get_toml('llvm-config') or self.get_mk('CFG_LLVM_ROOT')): (self.get_toml('llvm-config') or self.get_mk('CFG_LLVM_ROOT')):
continue continue
if path.endswith(b"jemalloc") and \ if path.endswith('jemalloc') and \
(self.get_toml('jemalloc') or self.get_mk('CFG_JEMALLOC_ROOT')): (self.get_toml('jemalloc') or self.get_mk('CFG_JEMALLOC_ROOT')):
continue continue
submod_path = os.path.join(self.rust_root, path) submod_path = os.path.join(self.rust_root, path)