SCons: Remove old Python 2 compat code

(cherry picked from commit 958776dfc3)
pull/1570/head
Rémi Verschelde 2024-07-18 10:35:16 +02:00 committed by David Snopek
parent aeb8be98ed
commit 806c38e189
1 changed files with 3 additions and 13 deletions

View File

@ -1,3 +1,4 @@
import codecs
import os
import subprocess
import sys
@ -5,17 +6,6 @@ import sys
import common_compiler_flags
from SCons.Variables import BoolVariable
if sys.version_info < (3,):
def decode_utf8(x):
return x
else:
import codecs
def decode_utf8(x):
return codecs.utf_8_decode(x)[0]
def has_ios_osxcross():
return "OSXCROSS_IOS" in os.environ
@ -53,9 +43,9 @@ def generate(env):
if sys.platform == "darwin":
if env["IOS_SDK_PATH"] == "":
try:
env["IOS_SDK_PATH"] = decode_utf8(
env["IOS_SDK_PATH"] = codecs.utf_8_decode(
subprocess.check_output(["xcrun", "--sdk", sdk_name, "--show-sdk-path"]).strip()
)
)[0]
except (subprocess.CalledProcessError, OSError):
raise ValueError(
"Failed to find SDK path while running xcrun --sdk {} --show-sdk-path.".format(sdk_name)