diff options
| author | Mikhail Glushenkov <foldr@codedgers.com> | 2010-11-02 20:32:59 +0000 |
|---|---|---|
| committer | Mikhail Glushenkov <foldr@codedgers.com> | 2010-11-02 20:32:59 +0000 |
| commit | c8aef4b2ea23f7da3668f35872ee5bd8df28bcc0 (patch) | |
| tree | 72759d3378625197dba79f9da543312a7e897099 | |
| parent | 572ec1f3c0fd2386ce8a7dbeb7c15b3ac8ab1878 (diff) | |
| download | llvm-c8aef4b2ea23f7da3668f35872ee5bd8df28bcc0.tar.gz llvm-c8aef4b2ea23f7da3668f35872ee5bd8df28bcc0.tar.bz2 llvm-c8aef4b2ea23f7da3668f35872ee5bd8df28bcc0.tar.xz | |
GetDLLSuffix: Remove the leading dot from LTDL_SHLIB_EXT.
This allows using GetDLLSuffix() with appendSuffix().
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118051 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Linker/Linker.cpp | 2 | ||||
| -rw-r--r-- | lib/System/Path.cpp | 2 | ||||
| -rw-r--r-- | tools/llvm-ld/llvm-ld.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/Linker/Linker.cpp b/lib/Linker/Linker.cpp index eb3fb6b1c2..19ecaa3965 100644 --- a/lib/Linker/Linker.cpp +++ b/lib/Linker/Linker.cpp @@ -133,7 +133,7 @@ static inline sys::Path IsLibrary(StringRef Name, // Try the libX.so (or .dylib) form FullPath.eraseSuffix(); - FullPath.appendSuffix(&(LTDL_SHLIB_EXT[1])); + FullPath.appendSuffix(sys::Path::GetDLLSuffix()); if (FullPath.isDynamicLibrary()) // Native shared library? return FullPath; if (FullPath.isBitcodeFile()) // .so file containing bitcode? diff --git a/lib/System/Path.cpp b/lib/System/Path.cpp index ae166a574d..8fc4153acb 100644 --- a/lib/System/Path.cpp +++ b/lib/System/Path.cpp @@ -192,7 +192,7 @@ Path::FindLibrary(std::string& name) { } StringRef Path::GetDLLSuffix() { - return LTDL_SHLIB_EXT; + return &(LTDL_SHLIB_EXT[1]); } bool diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp index 9277554d5f..a28592bd97 100644 --- a/tools/llvm-ld/llvm-ld.cpp +++ b/tools/llvm-ld/llvm-ld.cpp @@ -455,7 +455,7 @@ static void EmitShellScript(char **argv, Module *M) { E = LibPaths.end(); P != E; ++P) { FullLibraryPath = *P; FullLibraryPath.appendComponent("lib" + *i); - FullLibraryPath.appendSuffix(&(LTDL_SHLIB_EXT[1])); + FullLibraryPath.appendSuffix(sys::Path::GetDLLSuffix()); if (!FullLibraryPath.isEmpty()) { if (!FullLibraryPath.isDynamicLibrary()) { // Not a native shared library; mark as invalid |