godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23942 from buresu/fix-osx-build-error 

[macOS] Fixed a problem sdk path could not be detected
This commit is contained in:
Rémi Verschelde 2018-11-28 10:36:42 +01:00 committed by GitHub
parent 78cdbc54b0 577e547b6a
commit 6612d2cb2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
methods.py
View File

@ -6,7 +6,7 @@ import glob
import string
import datetime
import subprocess
from compat import iteritems, isbasestring
from compat import iteritems, isbasestring, decode_utf8
def add_source_files(self, sources, filetype, lib_env=None, shared=False):
@ -645,7 +645,7 @@ def detect_darwin_sdk_path(platform, env):
if not env[var_name]:
try:
sdk_path = subprocess.check_output(['xcrun', '--sdk', sdk_name, '--show-sdk-path']).strip()
sdk_path = decode_utf8(subprocess.check_output(['xcrun', '--sdk', sdk_name, '--show-sdk-path']).strip())
if sdk_path:
env[var_name] = sdk_path
except (subprocess.CalledProcessError, OSError) as e: