Skip to content

Commit a0b6af1

Browse files
authored
Merge pull request #2801 from apple/🍒/ganymede/7d15fb577945
[lldb/test] Respect --apple-sdk path when querying SDK info
2 parents b8334e8 + c8853a4 commit a0b6af1

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

lldb/packages/Python/lldbsuite/test/lldbutil.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
# LLDB modules
2222
import lldb
2323
from . import lldbtest_config
24+
from . import configuration
2425

2526
# How often failed simulator process launches are retried.
2627
SIMULATOR_RETRY = 3
@@ -62,6 +63,11 @@ def mkdir_p(path):
6263
# ============================
6364

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

0 commit comments

Comments
 (0)