From 7616f87a61305bbc34ac34ec76eca4f420d56ebe Mon Sep 17 00:00:00 2001
From: Fabrice <schaubfabrice@gmail.com>
Date: Thu, 3 Sep 2026 15:07:08 +0200
Subject: [PATCH] rust_bindgen_library: support cc_lib targets with only a
 dynamic library (#4234)

---
 extensions/bindgen/private/bindgen.bzl        |  6 ++-
 .../bindgen/test/analysis/bindgen_test.bzl    | 43 ++++++++++++++++++-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/extensions/bindgen/private/bindgen.bzl b/extensions/bindgen/private/bindgen.bzl
index b5f9ec1cac..74807589d5 100644
--- a/extensions/bindgen/private/bindgen.bzl
+++ b/extensions/bindgen/private/bindgen.bzl
@@ -179,9 +179,13 @@ def _generate_cc_link_build_info(ctx, cc_lib):
                 rustc_flags.append("-lstatic={}".format(get_lib_name_default(lib.pic_static_library)))
                 linker_search_paths.append(lib.pic_static_library.dirname)
                 compile_data.append(lib.pic_static_library)
+            elif lib.dynamic_library:
+                rustc_flags.append("-ldylib={}".format(get_lib_name_default(lib.dynamic_library)))
+                linker_search_paths.append(lib.dynamic_library.dirname)
+                compile_data.append(lib.dynamic_library)
 
     if not compile_data:
-        fail("No static libraries found in {}".format(
+        fail("No static or dynamic libraries found in {}".format(
             cc_lib.label,
         ))
 
diff --git a/extensions/bindgen/test/analysis/bindgen_test.bzl b/extensions/bindgen/test/analysis/bindgen_test.bzl
index 7cb0e729ca..92c74ed936 100644
--- a/extensions/bindgen/test/analysis/bindgen_test.bzl
+++ b/extensions/bindgen/test/analysis/bindgen_test.bzl
@@ -1,6 +1,7 @@
 """Analysis test for for rust_bindgen_library rule."""
 
-load("@rules_cc//cc:defs.bzl", "cc_library")
+load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library")
+load("@rules_cc//cc:defs.bzl", "cc_import", "cc_library")
 load("@rules_rust//rust:defs.bzl", "rust_binary")
 load("@rules_rust_bindgen//:defs.bzl", "rust_bindgen_library")
 load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite")
@@ -100,6 +101,45 @@ def _test_cc_lib_object_merging_disabled(name):
         impl = _test_cc_lib_object_merging_disabled_impl,
     )
 
+def _test_cc_lib_dynamic_only_impl(env, target):
+    env.expect.that_int(len(target.actions)).is_greater_than(2)
+    env.expect.that_action(target.actions[0]).mnemonic().contains("RustBindgen")
+    env.expect.that_action(target.actions[1]).mnemonic().contains("FileWrite")
+    env.expect.that_action(target.actions[1]).content().contains("-ldylib=test_cc_lib_dynamic_only_cc_shared")
+
+def _test_cc_lib_dynamic_only(name):
+    cc_library(
+        name = name + "_cc_objects",
+        srcs = ["simple.cc"],
+        hdrs = ["simple.h"],
+        tags = ["manual"],
+    )
+    cc_shared_library(
+        name = name + "_cc_shared",
+        deps = [name + "_cc_objects"],
+        tags = ["manual"],
+    )
+    cc_import(
+        name = name + "_cc",
+        shared_library = name + "_cc_shared",
+        hdrs = ["simple.h"],
+        tags = ["manual"],
+    )
+
+    rust_bindgen_library(
+        name = name + "_rust_bindgen",
+        cc_lib = name + "_cc",
+        header = "simple.h",
+        tags = ["manual"],
+        edition = "2021",
+    )
+
+    analysis_test(
+        name = name,
+        target = name + "_rust_bindgen__bindgen",
+        impl = _test_cc_lib_dynamic_only_impl,
+    )
+
 def bindgen_test_suite(name):
     test_suite(
         name = name,
@@ -107,5 +147,6 @@ def bindgen_test_suite(name):
             _test_cc_linkopt,
             _test_cc_lib_object_merging,
             _test_cc_lib_object_merging_disabled,
+            _test_cc_lib_dynamic_only,
         ],
     )