From 34b2072599c2d14a36ed8cb7adeb0db44b8f76b3 Mon Sep 17 00:00:00 2001
From: Joshua Cotton <jcotton42@outlook.com>
Date: Wed, 6 May 2020 20:24:40 -0400
Subject: [PATCH] Fix bootstrap failing on win32
---
src/bootstrap/bootstrap.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 9a91f37c5deb6..b7d0fac5be31f 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -180,13 +180,16 @@ 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)
+ required = sys.platform != 'win32'
+ ostype = require(["uname", "-s"], exit=required)
+ cputype = require(['uname', '-m'], exit=required)
if ostype is None or cputype is None:
return 'x86_64-pc-windows-msvc'
+ ostype = ostype.decode(default_encoding)
+ cputype = cputype.decode(default_encoding)
+
# 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.
ostype_mapper = {