Skip to content
Snippets Groups Projects
Commit 2c3991ac authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

GetDLLSuffix: Remove the leading dot from LTDL_SHLIB_EXT.

This allows using GetDLLSuffix() with appendSuffix().

llvm-svn: 118051
parent f26f4a05
No related branches found
No related tags found
No related merge requests found
...@@ -133,7 +133,7 @@ static inline sys::Path IsLibrary(StringRef Name, ...@@ -133,7 +133,7 @@ static inline sys::Path IsLibrary(StringRef Name,
// Try the libX.so (or .dylib) form // Try the libX.so (or .dylib) form
FullPath.eraseSuffix(); FullPath.eraseSuffix();
FullPath.appendSuffix(&(LTDL_SHLIB_EXT[1])); FullPath.appendSuffix(sys::Path::GetDLLSuffix());
if (FullPath.isDynamicLibrary()) // Native shared library? if (FullPath.isDynamicLibrary()) // Native shared library?
return FullPath; return FullPath;
if (FullPath.isBitcodeFile()) // .so file containing bitcode? if (FullPath.isBitcodeFile()) // .so file containing bitcode?
......
...@@ -192,7 +192,7 @@ Path::FindLibrary(std::string& name) { ...@@ -192,7 +192,7 @@ Path::FindLibrary(std::string& name) {
} }
StringRef Path::GetDLLSuffix() { StringRef Path::GetDLLSuffix() {
return LTDL_SHLIB_EXT; return &(LTDL_SHLIB_EXT[1]);
} }
bool bool
......
...@@ -455,7 +455,7 @@ static void EmitShellScript(char **argv, Module *M) { ...@@ -455,7 +455,7 @@ static void EmitShellScript(char **argv, Module *M) {
E = LibPaths.end(); P != E; ++P) { E = LibPaths.end(); P != E; ++P) {
FullLibraryPath = *P; FullLibraryPath = *P;
FullLibraryPath.appendComponent("lib" + *i); FullLibraryPath.appendComponent("lib" + *i);
FullLibraryPath.appendSuffix(&(LTDL_SHLIB_EXT[1])); FullLibraryPath.appendSuffix(sys::Path::GetDLLSuffix());
if (!FullLibraryPath.isEmpty()) { if (!FullLibraryPath.isEmpty()) {
if (!FullLibraryPath.isDynamicLibrary()) { if (!FullLibraryPath.isDynamicLibrary()) {
// Not a native shared library; mark as invalid // Not a native shared library; mark as invalid
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment