From ce53e7f9e2ec636b98492292d345c6ac611bb4b6 Mon Sep 17 00:00:00 2001
From: Michael Carroll <mjcarroll@intrinsic.ai>
Date: Fri, 15 Nov 2024 20:34:41 +0000
Subject: [PATCH] Fix bazel rules for layering_check and parse_headers with
 clang

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
---
 BUILD.bazel     | 13 ++++++++++---
 cli/BUILD.bazel |  5 ++++-
 log/BUILD.bazel | 12 ++++++++++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index 5903898..25c091f 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -113,7 +113,10 @@ cc_library(
         "test/integration/implptr/implptr_test_classes.hh",
     ],
     includes = ["test/integration/implptr"],
-    deps = [":ImplPtr"],
+    deps = [
+        ":Export",
+        ":ImplPtr",
+    ],
 )
 
 cc_test(
@@ -122,6 +125,7 @@ cc_test(
     srcs = ["test/integration/implptr/ImplPtr_TEST.cc"],
     deps = [
         ":implptr_test_classes",
+        "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
 )
@@ -131,6 +135,7 @@ cc_test(
     srcs = ["src/Environment_TEST.cc"],
     deps = [
         ":Environment",
+        "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
 )
@@ -140,7 +145,7 @@ cc_binary(
     srcs = ["test/integration/subprocess/subprocess_main.cc"],
     deps = [
         ":Environment",
-        "//cli",
+        "//cli:cli11",
     ],
 )
 
@@ -149,8 +154,10 @@ cc_test(
     srcs = ["test/integration/subprocess_TEST.cc"],
     local_defines = ['SUBPROCESS_EXECUTABLE_PATH=\\"subprocess_main\\"'],
     deps = [
-        ":gz-utils",
+        ":Environment",
+        ":Subprocess",
         ":subprocess_main",
+        "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
 )
diff --git a/cli/BUILD.bazel b/cli/BUILD.bazel
index 9b3bcc8..3d57df4 100644
--- a/cli/BUILD.bazel
+++ b/cli/BUILD.bazel
@@ -17,6 +17,7 @@ cc_library(
         "-parse_headers",
     ],
     includes = ["include/vendored-cli"],
+    visibility = ["//visibility:public"],
 )
 
 cc_library(
@@ -45,7 +46,9 @@ cc_test(
     name = "cli_TEST",
     srcs = ["src/cli_TEST.cc"],
     deps = [
-        ":cli",
+        ":GzFormatter",
+        ":cli11",
+        "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
 )
diff --git a/log/BUILD.bazel b/log/BUILD.bazel
index 5a878d0..876d7d5 100644
--- a/log/BUILD.bazel
+++ b/log/BUILD.bazel
@@ -44,7 +44,13 @@ cc_library(
     ],
     includes = ["include"],
     visibility = ["//visibility:public"],
-    deps = [":SplitSink"],
+    deps = [
+        ":Export",
+        ":SplitSink",
+        "//:Config",
+        "//:ImplPtr",
+        "@spdlog",
+    ],
 )
 
 cc_library(
@@ -61,7 +67,9 @@ cc_test(
     srcs = ["src/SplitSink_TEST.cc"],
     visibility = ["//visibility:public"],
     deps = [
-        ":log",
+        ":SplitSink",
+        "@googletest//:gtest",
         "@googletest//:gtest_main",
+        "@spdlog",
     ],
 )