replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better validation when we think a directory might be Xcode.app. 

LLDB could otherwise get confused if it is (for example) in a
root that is meant to install into an Xcode.app but hasn't
been installed yet.  That way Xcode can fall back to the real
Xcode.app rather than trying to look for resources inside the
root.

llvm-svn: 252198
This commit is contained in:
Sean Callanan 2015-11-05 19:46:12 +00:00
parent 4bf262a0f2
commit a95b131c9b
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
View File

@ -1225,7 +1225,16 @@ CheckPathForXcode(const FileSpec &fspec)
if (pos != std::string::npos)
{
path_to_shlib.erase(pos + strlen(substr));
return FileSpec(path_to_shlib.c_str(), false);
FileSpec ret (path_to_shlib.c_str(), false);
FileSpec xcode_binary_path = ret;
xcode_binary_path.AppendPathComponent("MacOS");
xcode_binary_path.AppendPathComponent("Xcode");
if (xcode_binary_path.Exists())
{
return ret;
}
}
}
return FileSpec();