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 | e6a41815f307135be3fb7f3d27e8b64989b713a7 (patch) | |
| tree | 234c14e368791346f50b475c417c75f73759b1c5 /llvm | |
| parent | 666aaf715f110fad2ad8a6b55aaefad234926c22 (diff) | |
| download | bcm5719-llvm-e6a41815f307135be3fb7f3d27e8b64989b713a7.tar.gz bcm5719-llvm-e6a41815f307135be3fb7f3d27e8b64989b713a7.zip | |
Fixes for PR214. Use the SHLIBEXT variable instead of hardcoding .so into
every file.
llvm-svn: 10976
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Support/PluginLoader.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Support/ToolRunner.cpp | 2 | ||||
| -rw-r--r-- | llvm/tools/gccld/Linker.cpp | 4 | ||||
| -rw-r--r-- | llvm/tools/llee/Makefile | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/Support/PluginLoader.cpp b/llvm/lib/Support/PluginLoader.cpp index be8833d0096..1e67b94f69d 100644 --- a/llvm/lib/Support/PluginLoader.cpp +++ b/llvm/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/llvm/lib/Support/ToolRunner.cpp b/llvm/lib/Support/ToolRunner.cpp index b1fb64b9908..f81da620eff 100644 --- a/llvm/lib/Support/ToolRunner.cpp +++ b/llvm/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(), diff --git a/llvm/tools/gccld/Linker.cpp b/llvm/tools/gccld/Linker.cpp index 7cd440d1d26..296d87b0eb4 100644 --- a/llvm/tools/gccld/Linker.cpp +++ b/llvm/tools/gccld/Linker.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/llvm/tools/llee/Makefile b/llvm/tools/llee/Makefile index a93c4deddc2..50632e09743 100644 --- a/llvm/tools/llee/Makefile +++ b/llvm/tools/llee/Makefile @@ -16,7 +16,7 @@ all:: llee llee: $(DESTTOOLCURRENT)/llee $(DESTTOOLCURRENT)/llee: Makefile - echo exec env LD_PRELOAD=$(DESTLIBCURRENT)/execve.so $$\* > $@ + echo exec env LD_PRELOAD=$(DESTLIBCURRENT)/execve$(SHLIBEXT) $$\* > $@ chmod u+x $@ clean:: |
