aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2010-10-30 17:32:40 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2010-10-30 17:32:40 +0000
commitaeed3da83c112d0649c30493c059314d85d99080 (patch)
treee81d99a03aaad6c9a9425c4531c3477e6541095e
parent5e0cc38286e4063d34791437322c59af5e0679e5 (diff)
Turns out that we may end up calling dladdr on GetExecutablePath, give it external linkage to make sure the lookup works on all platforms.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@117813 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--examples/clang-interpreter/main.cpp2
-rw-r--r--tools/driver/driver.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/examples/clang-interpreter/main.cpp b/examples/clang-interpreter/main.cpp
index b274efa8b0..2866c44c3c 100644
--- a/examples/clang-interpreter/main.cpp
+++ b/examples/clang-interpreter/main.cpp
@@ -32,7 +32,7 @@
using namespace clang;
using namespace clang::driver;
-static llvm::sys::Path GetExecutablePath(const char *Argv0) {
+llvm::sys::Path 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 *MainAddr = (void*) (intptr_t) GetExecutablePath;
diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
index 0bd0c60946..c1172817ed 100644
--- a/tools/driver/driver.cpp
+++ b/tools/driver/driver.cpp
@@ -36,8 +36,7 @@
using namespace clang;
using namespace clang::driver;
-static llvm::sys::Path GetExecutablePath(const char *Argv0,
- bool CanonicalPrefixes) {
+llvm::sys::Path GetExecutablePath(const char *Argv0, bool CanonicalPrefixes) {
if (!CanonicalPrefixes)
return llvm::sys::Path(Argv0);