From 7dbe3f7c0499ee201b426ea3b877da64423c3547 Mon Sep 17 00:00:00 2001 From: Yuannan Cai Date: Mon, 7 Nov 2016 18:35:26 +0000 Subject: 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 --- src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools') 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, -- cgit v1.2.3