aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools
diff options
context:
space:
mode:
authorGravatar Yuannan Cai <yuannan@google.com>2016-11-07 18:35:26 +0000
committerGravatar Klaus Aehlig <aehlig@google.com>2016-11-08 09:14:14 +0000
commit7dbe3f7c0499ee201b426ea3b877da64423c3547 (patch)
treef6ca79a9da1f419a9e653c9bd4fdcc691ad5a3e2 /src/main/java/com/google/devtools
parentdbb3487f71cc15bcb5f1addec6d103983088ff48 (diff)
Fix a bug that causes unnecessary warning "setting 'linkstatic=1' is recommended if there are no object files", when versioned shared library is in srcs fields like "a.so.2.0".
In appearsToHaveObjectFiles(), we take into account SHARED_LIBRARY, but no VERSIONED_SHARED_LIBRARY. Fixes #310 . -- MOS_MIGRATED_REVID=138408789
Diffstat (limited to 'src/main/java/com/google/devtools')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
index 885ca0a0bc..cd7a319d1c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
@@ -59,7 +59,7 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory {
private static final FileTypeSet NO_OBJECT_GENERATING_FILETYPES = FileTypeSet.of(
CppFileTypes.CPP_HEADER, CppFileTypes.ARCHIVE, CppFileTypes.PIC_ARCHIVE,
CppFileTypes.ALWAYS_LINK_LIBRARY, CppFileTypes.ALWAYS_LINK_PIC_LIBRARY,
- CppFileTypes.SHARED_LIBRARY);
+ CppFileTypes.SHARED_LIBRARY, CppFileTypes.VERSIONED_SHARED_LIBRARY);
private static Runfiles collectRunfiles(RuleContext context,
CcLinkingOutputs ccLinkingOutputs,