summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Prantl <aprantl@apple.com>2019-03-12 23:59:02 +0000
committerAdrian Prantl <aprantl@apple.com>2019-03-12 23:59:02 +0000
commit22c660cc131cc6990d81d53ba3f2a8aed186f543 (patch)
tree18298e2f757b460285b304b3b8aaa519ac1a47cc
parent9bae5ba0769e09f2134aed366a502a8785d22ccc (diff)
downloadbcm5719-llvm-22c660cc131cc6990d81d53ba3f2a8aed186f543.tar.gz
bcm5719-llvm-22c660cc131cc6990d81d53ba3f2a8aed186f543.zip
Update the macOS implementation of ComputeClangResourceDirectory to
comply with the more pedantic TestPaths.py llvm-svn: 355994
-rw-r--r--lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp
index 6b515318c5e..b8d93c88836 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp
@@ -98,7 +98,7 @@ bool lldb_private::ComputeClangResourceDirectory(FileSpec &lldb_shlib_spec,
"Developer/Toolchains/XcodeDefault.xctoolchain",
swift_clang_resource_dir);
if (!verify || VerifyClangPath(clang_path)) {
- file_spec.SetFile(clang_path.c_str(), FileSpec::Style::native);
+ file_spec.GetDirectory().SetString(clang_path.c_str());
FileSystem::Instance().Resolve(file_spec);
return true;
}
@@ -113,7 +113,7 @@ bool lldb_private::ComputeClangResourceDirectory(FileSpec &lldb_shlib_spec,
raw_path.resize(parent - r_end);
llvm::sys::path::append(clang_path, raw_path, swift_clang_resource_dir);
if (!verify || VerifyClangPath(clang_path)) {
- file_spec.SetFile(clang_path.c_str(), FileSpec::Style::native);
+ file_spec.GetDirectory().SetString(clang_path.c_str());
FileSystem::Instance().Resolve(file_spec);
return true;
}
@@ -126,7 +126,7 @@ bool lldb_private::ComputeClangResourceDirectory(FileSpec &lldb_shlib_spec,
// Fall back to the Clang resource directory inside the framework.
raw_path.append("LLDB.framework/Resources/Clang");
- file_spec.SetFile(raw_path.c_str(), FileSpec::Style::native);
+ file_spec.GetDirectory().SetString(raw_path.c_str());
FileSystem::Instance().Resolve(file_spec);
return true;
#endif // __APPLE__
OpenPOWER on IntegriCloud