From 273bb34c380be738b1d003885d426c40e878ad5d Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Mon, 30 Jun 2014 19:56:37 +0000
Subject: [PATCH] Use the newly added FindInEnvPath helper in clang
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@212058 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/Driver/Driver.cpp | 31 +------------------------------
lib/Driver/Tools.cpp | 9 ++-------
2 files changed, 3 insertions(+), 37 deletions(-)
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index a18312a84fa..08dcc11d62e 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -939,35 +939,6 @@ void Driver::BuildUniversalActions(const ToolChain &TC,
}
}
-/// \brief Check whether the file referenced by Value exists in the LIB
-/// environment variable.
-static bool ExistsInLibDir(StringRef Value) {
- llvm::Optional<std::string> OptPath = llvm::sys::Process::GetEnv("LIB");
- if (!OptPath.hasValue())
- return false;
-
-#ifdef LLVM_ON_WIN32
- const StringRef PathSeparators = ";";
-#else
- const StringRef PathSeparators = ":";
-#endif
-
- SmallVector<StringRef, 8> LibDirs;
- llvm::SplitString(OptPath.getValue(), LibDirs, PathSeparators);
-
- for (const auto &LibDir : LibDirs) {
- if (LibDir.empty())
- continue;
-
- SmallString<128> FilePath(LibDir);
- llvm::sys::path::append(FilePath, Value);
- if (llvm::sys::fs::exists(Twine(FilePath)))
- return true;
- }
-
- return false;
-}
-
/// \brief Check that the file referenced by Value exists. If it doesn't,
/// issue a diagnostic and return false.
static bool DiagnoseInputExistence(const Driver &D, const DerivedArgList &Args,
@@ -991,7 +962,7 @@ static bool DiagnoseInputExistence(const Driver &D, const DerivedArgList &Args,
if (llvm::sys::fs::exists(Twine(Path)))
return true;
- if (D.IsCLMode() && ExistsInLibDir(Value))
+ if (D.IsCLMode() && llvm::sys::Process::FindInEnvPath("LIB", Value))
return true;
D.Diag(clang::diag::err_drv_no_such_file) << Path.str();
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 3587bbb2f5f..f5d79941363 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -7651,14 +7651,9 @@ static std::string FindFallback(const char *FallbackName,
if (!OptPath.hasValue())
return FallbackName;
-#ifdef LLVM_ON_WIN32
- const StringRef PathSeparators = ";";
-#else
- const StringRef PathSeparators = ":";
-#endif
-
+ const char EnvPathSeparatorStr[] = {llvm::sys::EnvPathSeparator, '\0'};
SmallVector<StringRef, 8> PathSegments;
- llvm::SplitString(OptPath.getValue(), PathSegments, PathSeparators);
+ llvm::SplitString(OptPath.getValue(), PathSegments, EnvPathSeparatorStr);
for (size_t i = 0, e = PathSegments.size(); i != e; ++i) {
const StringRef &PathSegment = PathSegments[i];
--
GitLab