diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-28 10:36:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 10:36:42 +0100 |
| commit | 6612d2cb2bb7468475e58b70eff2408996825cd8 (patch) | |
| tree | 5a694838031b9c0c51e448c3d2b0b66b62ecd70c /methods.py | |
| parent | 78cdbc54b0c77b0a860a6d55d4604baee97666f2 (diff) | |
| parent | 577e547b6a31cabb41be3360101bc22af3b5323c (diff) | |
Merge pull request #23942 from buresu/fix-osx-build-error
[macOS] Fixed a problem sdk path could not be detected
Diffstat (limited to 'methods.py')
| -rw-r--r-- | methods.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/methods.py b/methods.py index 5fcbc94298..f8fc6c64ef 100644 --- a/methods.py +++ b/methods.py @@ -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: |