Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-23 13:50:11 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix the DEVELOPER_DIR computation (#70528)

Browse Source 
The code was incorrectly going into the wrong direction by removing one
component instead of appendeing /Developer to it. Due to fallback
mechanisms in xcrun this never seemed to have caused any issues.
This commit is contained in:
Adrian Prantl 2023-10-30 10:00:40 -07:00 committed by GitHub
parent 284d136c4a
commit c42b640208
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm
View File

@ -461,13 +461,11 @@ static llvm::Expected<std::string> GetXcodeSDK(XcodeSDK sdk) {
// 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)) {
auto sdk = xcrun(sdk_name, show_sdk_path, shlib_developer_dir);
if (!sdk)
return sdk.takeError();
if (!sdk->empty())