From 02603e37acad020ef5da0a4e506e3e04cd820856 Mon Sep 17 00:00:00 2001
From: Ben Barham <ben_barham@apple.com>
Date: Wed, 7 Jun 2023 15:24:06 -0700
Subject: [PATCH] [Build] Read all shell output as UTF-8

Encodes the output back into ASCII as there's been issues with printing
UTF-8 in the past.

Resolves rdar://110412212.
---
 utils/swift_build_support/swift_build_support/shell.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/swift_build_support/swift_build_support/shell.py b/utils/swift_build_support/swift_build_support/shell.py
index d50c12788c450..a2d33c06e4c22 100644
--- a/utils/swift_build_support/swift_build_support/shell.py
+++ b/utils/swift_build_support/swift_build_support/shell.py
@@ -228,8 +228,10 @@ def run(*args, **kwargs):
     my_pipe = subprocess.Popen(
         *args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
         universal_newlines=True,
+        encoding='utf-8',
         **kwargs)
     (output, _) = my_pipe.communicate()
+    output = output.encode(encoding='ascii', errors='replace')
     ret = my_pipe.wait()
 
     if lock: