Author: Vedant Kumar Date: 2021-04-01T10:15:25-07:00 New Revision: 7d15fb5779452c5efbceb82ce0e1f8724a82d290
URL: https://github.com/llvm/llvm-project/commit/7d15fb5779452c5efbceb82ce0e1f8724a82d290 DIFF: https://github.com/llvm/llvm-project/commit/7d15fb5779452c5efbceb82ce0e1f8724a82d290.diff LOG: [lldb/test] Respect --apple-sdk path when querying SDK info 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. Differential Revision: https://reviews.llvm.org/D99746 Added: Modified: lldb/packages/Python/lldbsuite/test/lldbutil.py Removed: ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/lldbutil.py b/lldb/packages/Python/lldbsuite/test/lldbutil.py index d4fd7f4b1f654..06a84c2554000 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbutil.py +++ b/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 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" _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
