This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG7d15fb577945: [lldb/test] Respect --apple-sdk path when
querying SDK info (authored by vsk).
Changed prior to commit:
https://reviews.llvm.org/D99746?vs=334737&id=334749#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D99746/new/
https://reviews.llvm.org/D99746
Files:
lldb/packages/Python/lldbsuite/test/lldbutil.py
Index: lldb/packages/Python/lldbsuite/test/lldbutil.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/lldbutil.py
+++ lldb/packages/Python/lldbsuite/test/lldbutil.py
@@ -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
@@ -62,6 +63,11 @@
# ============================
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"
Index: lldb/packages/Python/lldbsuite/test/lldbutil.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/lldbutil.py
+++ lldb/packages/Python/lldbsuite/test/lldbutil.py
@@ -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
@@ -62,6 +63,11 @@
# ============================
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"
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
