Fix an oversight in GetXcodeContentsDirectory()

adrian-prantl · adrian-prantl · commit ad4e7b9dc82b · 2020-06-05T13:50:37.000-07:00
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
diff --git a/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm
@@ -326,9 +326,9 @@ static void ParseOSVersion(llvm::VersionTuple &version, NSString *Key) {
       }
     }
 
-    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()) {

Original file line number	Diff line number	Diff line change
`@@ -326,9 +326,9 @@ static void ParseOSVersion(llvm::VersionTuple &version, NSString *Key) {`
`326`	`326`	`}`
`327`	`327`	`}`
`328`	`328`
`329`		`- std::string env_developer_dir = GetEnvDeveloperDir();`
	`329`	`+ llvm::SmallString<128> env_developer_dir(GetEnvDeveloperDir());`
`330`	`330`	`if (!env_developer_dir.empty()) {`
`331`		`- // FIXME: This looks like it couldn't possibly work!`
	`331`	`+ llvm::sys::path::append(env_developer_dir, "Contents");`
`332`	`332`	`std::string xcode_contents_dir =`
`333`	`333`	`XcodeSDK::FindXcodeContentsDirectoryInPath(env_developer_dir);`
`334`	`334`	`if (!xcode_contents_dir.empty()) {`