diff options
| -rw-r--r-- | lib/Linker/LinkArchives.cpp | 4 | ||||
| -rw-r--r-- | lib/Support/PluginLoader.cpp | 2 | ||||
| -rw-r--r-- | lib/Support/ToolRunner.cpp | 2 | ||||
| -rw-r--r-- | tools/bugpoint/ToolRunner.cpp | 2 | ||||
| -rw-r--r-- | tools/gccld/Linker.cpp | 4 | ||||
| -rw-r--r-- | tools/llee/Makefile | 2 |
6 files changed, 8 insertions, 8 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(), diff --git a/tools/bugpoint/ToolRunner.cpp b/tools/bugpoint/ToolRunner.cpp index b1fb64b990..f81da620ef 100644 --- a/tools/bugpoint/ToolRunner.cpp +++ b/tools/bugpoint/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/tools/gccld/Linker.cpp b/tools/gccld/Linker.cpp index 7cd440d1d2..296d87b0eb 100644 --- a/tools/gccld/Linker.cpp +++ b/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/tools/llee/Makefile b/tools/llee/Makefile index a93c4deddc..50632e0974 100644 --- a/tools/llee/Makefile +++ b/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:: |