Skip to content

Fix bootstrap for windows #71974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix bootstrap for windows #71974

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions src/bootstrap/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,13 @@ def run(args, verbose=False, exception=False, **kwargs):
sys.exit(err)


def require(cmd, exit=True):
def require(cmd, exit=True, encoding=sys.getdefaultencoding()):
'''Run a command, returning its output.
On error,
If `exit` is `True`, exit the process.
Otherwise, return None.'''
try:
return subprocess.check_output(cmd).strip()
return subprocess.check_output(cmd).strip().decode(encoding)
except (subprocess.CalledProcessError, OSError) as exc:
if not exit:
return None
Expand Down Expand Up @@ -179,10 +179,10 @@ def format_build_time(duration):

def default_build_triple():
"""Build triple as in LLVM"""
default_encoding = sys.getdefaultencoding()
required = not sys.platform == 'win32'
ostype = require(["uname", "-s"], exit=required).decode(default_encoding)
cputype = require(['uname', '-m'], exit=required).decode(default_encoding)
default_encoding = sys.getdefaultencoding()
ostype = require(["uname", "-s"], exit=required, encoding=default_encoding)
cputype = require(['uname', '-m'], exit=required, encoding=default_encoding)

if ostype is None or cputype is None:
return 'x86_64-pc-windows-msvc'
Expand Down Expand Up @@ -215,7 +215,7 @@ def default_build_triple():
# output from that option is too generic for our purposes (it will
# always emit 'i386' on x86/amd64 systems). As such, isainfo -k
# must be used instead.
cputype = require(['isainfo', '-k']).decode(default_encoding)
cputype = require(['isainfo', '-k'])
elif ostype.startswith('MINGW'):
# msys' `uname` does not print gcc configuration, but prints msys
# configuration. so we cannot believe `uname -m`:
Expand Down Expand Up @@ -770,10 +770,8 @@ def update_submodules(self):
self.get_toml('submodules') == "false":
return

default_encoding = sys.getdefaultencoding()

# check the existence and version of 'git' command
git_version_str = require(['git', '--version']).split()[2].decode(default_encoding)
git_version_str = require(['git', '--version']).split()[2]
self.git_version = distutils.version.LooseVersion(git_version_str)

slow_submodules = self.get_toml('fast-submodules') == "false"
Expand Down