Allow "bc" as suffix for bytecode files.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16381 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/System/Unix/Path.cpp b/lib/System/Unix/Path.cpp
index 329bf37e387f49caf4066381784871ba780f201a..182a0bbd8caf88291f6ec66779bd32f8c40a1f81 100644 (file)
--- a/lib/System/Unix/Path.cpp
+++ b/lib/System/Unix/Path.cpp
@@ -52,6 +52,8 @@ static inline bool IsLibrary(Path& path, const std::string& basename) {
       return true;
     else if (path.elide_suffix() && path.append_suffix("o") && path.readable())
       return true;
+    else if (path.elide_suffix() && path.append_suffix("bc") && path.readable())
+      return true;
   } else if (path.elide_file() && path.append_file(basename)) {
     if (path.append_suffix(Path::GetDLLSuffix()) && path.readable())
       return true;
@@ -59,6 +61,8 @@ static inline bool IsLibrary(Path& path, const std::string& basename) {
       return true;
     else if (path.elide_suffix() && path.append_suffix("o") && path.readable())
       return true;
+    else if (path.elide_suffix() && path.append_suffix("bc") && path.readable())
+      return true;
   }
   path.clear();
   return false;
@@ -76,6 +80,10 @@ Path::GetLibraryPath(const std::string& basename,
       return result;
   }
 
+  // Try the LLVM lib directory in the LLVM install area
+  if (result.set_directory(LLVM_LIBDIR) && IsLibrary(result,basename))
+    return result;
+
   // Try /usr/lib
   if (result.set_directory("/usr/lib/") && IsLibrary(result,basename))
     return result;

diff --git a/lib/System/Unix/Path.inc b/lib/System/Unix/Path.inc
index 329bf37e387f49caf4066381784871ba780f201a..182a0bbd8caf88291f6ec66779bd32f8c40a1f81 100644 (file)
--- a/lib/System/Unix/Path.inc
+++ b/lib/System/Unix/Path.inc
@@ -52,6 +52,8 @@ static inline bool IsLibrary(Path& path, const std::string& basename) {
       return true;
     else if (path.elide_suffix() && path.append_suffix("o") && path.readable())
       return true;
+    else if (path.elide_suffix() && path.append_suffix("bc") && path.readable())
+      return true;
   } else if (path.elide_file() && path.append_file(basename)) {
     if (path.append_suffix(Path::GetDLLSuffix()) && path.readable())
       return true;
@@ -59,6 +61,8 @@ static inline bool IsLibrary(Path& path, const std::string& basename) {
       return true;
     else if (path.elide_suffix() && path.append_suffix("o") && path.readable())
       return true;
+    else if (path.elide_suffix() && path.append_suffix("bc") && path.readable())
+      return true;
   }
   path.clear();
   return false;
@@ -76,6 +80,10 @@ Path::GetLibraryPath(const std::string& basename,
       return result;
   }
 
+  // Try the LLVM lib directory in the LLVM install area
+  if (result.set_directory(LLVM_LIBDIR) && IsLibrary(result,basename))
+    return result;
+
   // Try /usr/lib
   if (result.set_directory("/usr/lib/") && IsLibrary(result,basename))
     return result;