maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove extra "/" character from paths resolved in iOS SDKs and also be sure to update the SDK directory infos if needed before we start using m_sdk_directory_infos. 

llvm-svn: 221907
This commit is contained in:
Greg Clayton 2014-11-13 18:25:33 +00:00
parent 1339b5e8ae
commit 14418e0409
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
View File

@ -582,7 +582,7 @@ PlatformRemoteiOS::GetFileInSDKRoot (const char *platform_file_path,
{
::snprintf (resolved_path,
sizeof(resolved_path),
"%s/%s",
"%s%s",
sdkroot_path,
platform_file_path);
@ -593,7 +593,7 @@ PlatformRemoteiOS::GetFileInSDKRoot (const char *platform_file_path,
::snprintf (resolved_path,
sizeof(resolved_path),
"%s/Symbols.Internal/%s",
"%s/Symbols.Internal%s",
sdkroot_path,
platform_file_path);
@ -602,7 +602,7 @@ PlatformRemoteiOS::GetFileInSDKRoot (const char *platform_file_path,
return true;
::snprintf (resolved_path,
sizeof(resolved_path),
"%s/Symbols/%s",
"%s/Symbols%s",
sdkroot_path,
platform_file_path);
@ -694,6 +694,8 @@ PlatformRemoteiOS::GetSharedModule (const ModuleSpec &module_spec,
if (platform_file.GetPath(platform_file_path, sizeof(platform_file_path)))
{
FileSpec local_file;
UpdateSDKDirectoryInfosInNeeded();
const uint32_t num_sdk_infos = m_sdk_directory_infos.size();
// Try the last SDK index if it is set as most files from an SDK
// will tend to be valid in that same SDK.