From 9fa3e8bd62ecc6692847a389b80c11efbe86eb57 Mon Sep 17 00:00:00 2001
From: Josh Haberman <haberman@google.com>
Date: Tue, 23 Apr 2019 22:41:00 +0000
Subject: Fix the Ubuntu build.

---
 build_defs.bzl | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'build_defs.bzl')

diff --git a/build_defs.bzl b/build_defs.bzl
index 667db8a..d39db4d 100644
--- a/build_defs.bzl
+++ b/build_defs.bzl
@@ -406,18 +406,29 @@ _upb_proto_library_aspect = aspect(
     fragments = ["cpp"],
 )
 
+
+def filter_none(elems):
+    out = []
+    for elem in elems:
+        if elem:
+            out.append(elem)
+    return out
+
+
 def _upb_proto_library_impl(ctx):
     if len(ctx.attr.deps) != 1:
         fail("only one deps dependency allowed.")
     dep = ctx.attr.deps[0]
     if CcInfo not in dep:
         fail("proto_library rule must generate CcInfo (have cc_api_version>0).")
+    lib = dep[CcInfo].linking_context.libraries_to_link[0]
+    files = filter_none([
+        lib.static_library,
+        lib.pic_static_library,
+        lib.dynamic_library,
+    ])
     return [
-        DefaultInfo(
-            files = depset(
-                [dep[CcInfo].linking_context.libraries_to_link[0].static_library],
-            ),
-        ),
+        DefaultInfo(files = depset(files)),
         dep[CcInfo],
     ]
 
-- 
cgit v1.2.3