diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-26 05:01:35 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-26 05:01:35 +0000 |
commit | 50188c1f42c122640ab9ccac2134acf371c26b2c (patch) | |
tree | 05539e5a83063a0eeda3c9211dfb8153cc750f0c /tools/llvm-config | |
parent | 2c63b27e9f36dddc2660639026b19e606ad52cd0 (diff) | |
download | external_llvm-50188c1f42c122640ab9ccac2134acf371c26b2c.zip external_llvm-50188c1f42c122640ab9ccac2134acf371c26b2c.tar.gz external_llvm-50188c1f42c122640ab9ccac2134acf371c26b2c.tar.bz2 |
Port GetMainExecutable over to PathV2.
I will remove the V1 version as soon as I change clang in the next commit.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184914 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-config')
-rw-r--r-- | tools/llvm-config/llvm-config.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp index 5151d1a..fc3ab68 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp @@ -162,11 +162,11 @@ Typical components:\n\ } /// \brief Compute the path to the main executable. -llvm::sys::Path GetExecutablePath(const char *Argv0) { +std::string GetExecutablePath(const char *Argv0) { // This just needs to be some symbol in the binary; C++ doesn't // allow taking the address of ::main however. void *P = (void*) (intptr_t) GetExecutablePath; - return llvm::sys::Path::GetMainExecutable(Argv0, P); + return llvm::sys::fs::getMainExecutable(Argv0, P); } int main(int argc, char **argv) { @@ -180,7 +180,7 @@ int main(int argc, char **argv) { // tree. bool IsInDevelopmentTree; enum { MakefileStyle, CMakeStyle, CMakeBuildModeStyle } DevelopmentTreeLayout; - llvm::SmallString<256> CurrentPath(GetExecutablePath(argv[0]).str()); + llvm::SmallString<256> CurrentPath(GetExecutablePath(argv[0])); std::string CurrentExecPrefix; std::string ActiveObjRoot; |