Fix Bazel cc_library's deps and linkopts (#9381)

conan-io · Aug 20, 2021 · 95f2ed4 · 95f2ed4
1 parent db9db58
commit 95f2ed4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/conan/tools/google/bazeldeps.py b/conan/tools/google/bazeldeps.py
@@ -50,7 +50,17 @@ def _get_dependency_buildfile_content(self, dependency):
                 {% if defines %}
                 defines = [{{ defines }}],
                 {% endif %}
-                visibility = ["//visibility:public"]
+                {% if linkopts %}
+                linkopts = [{{ linkopts }}],
+                {% endif %}
+                visibility = ["//visibility:public"],
+                {% if libs %}
+                deps = [
+                {% for lib in libs %}
+                ":{{ lib }}_precompiled",
+                {% endfor %}
+                {% endif %}
+                ],
             )
 
         """)
@@ -74,13 +84,19 @@ def _get_dependency_buildfile_content(self, dependency):
                    for define in dependency.new_cpp_info.defines)
         defines = ', '.join(defines)
 
+        linkopts = []
+        for linkopt in dependency.new_cpp_info.system_libs:
+            linkopts.append('"-l{}"'.format(linkopt))
+        linkopts = ', '.join(linkopts)
+
         context = {
             "name": dependency.ref.name,
             "libs": dependency.new_cpp_info.libs,
             "libdir": dependency.new_cpp_info.libdirs[0],
             "headers": headers,
             "includes": includes,
-            "defines": defines
+            "defines": defines,
+            "linkopts": linkopts
         }
 
         content = Template(template).render(**context)

diff --git a/conans/test/unittests/tools/google/test_bazeldeps.py b/conans/test/unittests/tools/google/test_bazeldeps.py
@@ -14,6 +14,8 @@ def test_bazeldeps_dependency_buildfiles():
 
     cpp_info = CppInfo("mypkg", "dummy_root_folder1")
     cpp_info.defines = ["DUMMY_DEFINE=\"string/value\""]
+    cpp_info.system_libs = ["system_lib1"]
+    cpp_info.libs = ["lib1"]
 
     conanfile_dep = ConanFile(Mock(), None)
     conanfile_dep.cpp_info = cpp_info
@@ -31,6 +33,8 @@ def test_bazeldeps_dependency_buildfiles():
             dependency_content = bazeldeps._get_dependency_buildfile_content(dependency)
             assert 'cc_library(\n    name = "OriginalDepName",' in dependency_content
             assert 'defines = ["DUMMY_DEFINE=\'string/value\'"],' in dependency_content
+            assert 'linkopts = ["-lsystem_lib1"],' in dependency_content
+            assert 'deps = [\n    \n    ":lib1_precompiled",' in dependency_content
 
 
 def test_bazeldeps_main_buildfile():