================
@@ -461,13 +461,11 @@ static void ParseOSVersion(llvm::VersionTuple &version,
NSString *Key) {
// Invoke xcrun with the shlib dir.
if (FileSpec fspec = HostInfo::GetShlibDir()) {
if (FileSystem::Instance().Exists(fspec)) {
- std::string contents_dir =
- XcodeSDK::FindXcodeContentsDirectoryInPath(fspec.GetPath());
- llvm::StringRef shlib_developer_dir =
- llvm::sys::path::parent_path(contents_dir);
- if (!shlib_developer_dir.empty()) {
- auto sdk =
- xcrun(sdk_name, show_sdk_path, std::move(shlib_developer_dir));
+ llvm::SmallString<0> shlib_developer_dir(
+ XcodeSDK::FindXcodeContentsDirectoryInPath(fspec.GetPath()));
+ llvm::sys::path::append(shlib_developer_dir, "Developer");
+ if (FileSystem::Instance().Exists(shlib_developer_dir)) {
----------------
adrian-prantl wrote:
There is already a code path to try without DEVELOPER_DIR, and this avoids
making the same query twice if it doesn't exist.
https://github.com/llvm/llvm-project/pull/70528
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
