nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove PathV1.h from CompilerInvocation.cpp.

Browse Source 
llvm-svn: 184918
This commit is contained in:
Rafael Espindola
2013-06-26 05:40:30 +00:00
parent 4601c462a7
commit 380988340c
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
clang/lib/Frontend/CompilerInvocation.cpp
View File

@@ -32,7 +32,6 @@
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Host.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/PathV1.h"
#include "llvm/Support/system_error.h"
#include <sys/stat.h>
using namespace clang;
@@ -846,16 +845,16 @@ static InputKind ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
std::string CompilerInvocation::GetResourcesPath(const char *Argv0,
void *MainAddr) {
llvm::sys::Path P(llvm::sys::fs::getMainExecutable(Argv0, MainAddr));
SmallString<128> P(llvm::sys::fs::getMainExecutable(Argv0, MainAddr));
if (!P.isEmpty()) {
P.eraseComponent(); // Remove /clang from foo/bin/clang
P.eraseComponent(); // Remove /bin from foo/bin
if (!P.empty()) {
llvm::sys::path::remove_filename(P); // Remove /clang from foo/bin/clang
llvm::sys::path::remove_filename(P); // Remove /bin from foo/bin
// Get foo/lib/clang/<version>/include
P.appendComponent("lib");
P.appendComponent("clang");
P.appendComponent(CLANG_VERSION_STRING);
llvm::sys::path::append(P, "lib");
llvm::sys::path::append(P, "clang");
llvm::sys::path::append(P, CLANG_VERSION_STRING);
}
return P.str();