Allow .lib as cpp static library extension

--
Change-Id: I908020889a0c573af401d67e988c41d33c654015
Reviewed-on: https://bazel-review.googlesource.com/#/c/7223
MOS_MIGRATED_REVID=138508319

1 files changed, 19 insertions, 11 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java
index 59476636e4..394a925190 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java
@@ -76,17 +76,25 @@ public final class CppFileTypes {
     };
 
   public static final FileType PIC_ARCHIVE = FileType.of(".pic.a");
-  public static final FileType ARCHIVE = new FileType() {
-      final String ext = ".a";
-      @Override
-      public boolean apply(String filename) {
-        return filename.endsWith(ext) && !PIC_ARCHIVE.matches(filename);
-      }
-      @Override
-      public List<String> getExtensions() {
-        return ImmutableList.of(ext);
-      }
-    };
+  public static final FileType ARCHIVE =
+      new FileType() {
+        final List<String> extensions = ImmutableList.of(".a", ".lib");
+
+        @Override
+        public boolean apply(String filename) {
+          for (String ext : extensions) {
+            if (filename.endsWith(ext) && !PIC_ARCHIVE.matches(filename)) {
+              return true;
+            }
+          }
+          return false;
+        }
+
+        @Override
+        public List<String> getExtensions() {
+          return ImmutableList.copyOf(extensions);
+        }
+      };
 
   public static final FileType ALWAYS_LINK_PIC_LIBRARY = FileType.of(".pic.lo");
   public static final FileType ALWAYS_LINK_LIBRARY = new FileType() {