From ad4e7b9dc82b13d124071f0add09cb541b495a0e Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Fri, 5 Jun 2020 11:58:05 -0700 Subject: [PATCH] Fix an oversight in GetXcodeContentsDirectory() Since FindXcodeContentsDirectoryInPath expects the *.app/Contents and DEVELOPER_DIR is supposed to point to Xcode.app, we need to append the Contents path first. Differential Revision: https://reviews.llvm.org/D81290 --- lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm index 37bcff2..fd88d0c 100644 --- a/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm +++ b/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm @@ -326,9 +326,9 @@ FileSpec HostInfoMacOSX::GetXcodeContentsDirectory() { } } - std::string env_developer_dir = GetEnvDeveloperDir(); + llvm::SmallString<128> env_developer_dir(GetEnvDeveloperDir()); if (!env_developer_dir.empty()) { - // FIXME: This looks like it couldn't possibly work! + llvm::sys::path::append(env_developer_dir, "Contents"); std::string xcode_contents_dir = XcodeSDK::FindXcodeContentsDirectoryInPath(env_developer_dir); if (!xcode_contents_dir.empty()) { -- 2.7.4