Skip to content

[lldb/test] Respect --apple-sdk path when querying SDK info #2801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 7, 2021
Merged

[lldb/test] Respect --apple-sdk path when querying SDK info #2801

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lldb/packages/Python/lldbsuite/test/lldbutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
# LLDB modules
import lldb
from . import lldbtest_config
from . import configuration

# How often failed simulator process launches are retried.
SIMULATOR_RETRY = 3
Expand Down Expand Up @@ -62,6 +63,11 @@ def mkdir_p(path):
# ============================

def get_xcode_sdk(os, env):
# Respect --apple-sdk <path> if it's specified. If the SDK is simply
# mounted from some disk image, and not actually installed, this is the
# only way to use it.
if configuration.apple_sdk:
return configuration.apple_sdk
if os == "ios":
if env == "simulator":
return "iphonesimulator"
Expand Down