gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We do not define LTDL_SHLIBPATH_VAR, just use LD_LIBRARY_PATH etc.

Browse Source
This commit is contained in:
Axel Naumann 2013-09-25 16:53:35 +02:00 committed by sftnight
parent 40aa591bb8
commit 10c416332e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Interpreter/DynamicLibraryManager.cpp
View File

@ -64,8 +64,13 @@ namespace cling {
#if defined(LLVM_ON_UNIX)
static void GetSystemLibraryPaths(llvm::SmallVectorImpl<std::string>& Paths) {
#ifdef LTDL_SHLIBPATH_VAR
char* env_var = getenv(LTDL_SHLIBPATH_VAR);
char* env_var = getenv("LD_LIBRARY_PATH");
#if __APPLE__
if (!env_var)
env_var = getenv("DYLD_LIBRARY_PATH");
if (!env_var)
env_var = getenv("DYLD_FALLBACK_LIBRARY_PATH");
#endif
if (env_var != 0) {
static const char PathSeparator = ':';
const char* at = env_var;
@ -83,8 +88,6 @@ namespace cling {
Paths.push_back(at);
}
#endif
// FIXME: Should this look at LD_LIBRARY_PATH too?
Paths.push_back("/usr/local/lib/");
Paths.push_back("/usr/X11R6/lib/");
Paths.push_back("/usr/lib/");