diff options
| author | John Criswell <criswell@uiuc.edu> | 2004-01-26 20:59:41 +0000 |
|---|---|---|
| committer | John Criswell <criswell@uiuc.edu> | 2004-01-26 20:59:41 +0000 |
| commit | 7f7d16b62f9789c378a489a65ad51d50687c4c36 (patch) | |
| tree | 0dc7f53fb0aa8b8b0d0d15c39b72235b37b76217 /lib | |
| parent | 48e9f26df5f6085a1c972069ba6aa227821cd41c (diff) | |
Fixes for PR214. Use the SHLIBEXT variable instead of hardcoding .so into
every file.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10976 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Linker/LinkArchives.cpp | 4 | ||||
| -rw-r--r-- | lib/Support/PluginLoader.cpp | 2 | ||||
| -rw-r--r-- | lib/Support/ToolRunner.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/Linker/LinkArchives.cpp b/lib/Linker/LinkArchives.cpp index 7cd440d1d2..296d87b0eb 100644 --- a/lib/Linker/LinkArchives.cpp +++ b/lib/Linker/LinkArchives.cpp @@ -56,8 +56,8 @@ std::string llvm::FindLib(const std::string &Filename, if (!SharedObjectOnly && FileOpenable(Directory + LibName + ".bc")) return Directory + LibName + ".bc"; - if (FileOpenable(Directory + LibName + ".so")) - return Directory + LibName + ".so"; + if (FileOpenable(Directory + LibName + SHLIBEXT)) + return Directory + LibName + SHLIBEXT; if (!SharedObjectOnly && FileOpenable(Directory + LibName + ".a")) return Directory + LibName + ".a"; diff --git a/lib/Support/PluginLoader.cpp b/lib/Support/PluginLoader.cpp index be8833d009..1e67b94f69 100644 --- a/lib/Support/PluginLoader.cpp +++ b/lib/Support/PluginLoader.cpp @@ -37,5 +37,5 @@ namespace { // This causes operator= above to be invoked for every -load option. static cl::opt<PluginLoader, false, cl::parser<std::string> > -LoadOpt("load", cl::ZeroOrMore, cl::value_desc("plugin.so"), +LoadOpt("load", cl::ZeroOrMore, cl::value_desc("plugin" SHLIBEXT), cl::desc("Load the specified plugin")); diff --git a/lib/Support/ToolRunner.cpp b/lib/Support/ToolRunner.cpp index b1fb64b990..f81da620ef 100644 --- a/lib/Support/ToolRunner.cpp +++ b/lib/Support/ToolRunner.cpp @@ -337,7 +337,7 @@ int GCC::ExecuteProgram(const std::string &ProgramFile, int GCC::MakeSharedObject(const std::string &InputFile, FileType fileType, std::string &OutputFile) { - OutputFile = getUniqueFilename(InputFile+".so"); + OutputFile = getUniqueFilename(InputFile+SHLIBEXT); // Compile the C/asm file into a shared object const char* GCCArgs[] = { GCCPath.c_str(), |