Merge pull request #10 from aspect-build/cpp

fix cpp generation

.aspect/cli/rules_cc.star

@@ -33,9 +33,7 @@ def add_target(ctx, file, hdrs = []):
                 src = file.path,
             ))
     is_test = basename.endswith("-test") or basename.endswith(".test")
-    # TODO: query for whether there's a function named main with the expected signatune
-    is_main = False
-    print("deps", deps)
+    is_main = len(file.query_results["has_main"]) > 0
     attrs = {
         "srcs": [file.path],
         "hdrs": [h.path for h in hdrs],
@@ -91,6 +89,10 @@ aspect.register_configure_extension(
                 filter = "*.cc",
                 expression = """#include\\s+"(?P<import>[^.]+).h\"""",
             ),
+            "has_main": aspect.RegexQuery(
+                filter = "*.cc",
+                expression = "int\\s+main\\(",
+            ),
         },
     ),
     declare = declare,

.bazeliskrc

@@ -1,2 +1,2 @@
 BAZELISK_BASE_URL=https://static.aspect.build/aspect
-USE_BAZEL_VERSION=aspect/2024.33.13
+USE_BAZEL_VERSION=aspect/2024.33.63

MODULE.bazel

@@ -22,7 +22,13 @@ bazel_dep(name = "toolchains_llvm", version = "1.1.2")
 bazel_dep(name = "toolchains_protoc", version = "0.3.1")
 
 llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
-llvm.toolchain(llvm_version = "15.0.6")
+llvm.toolchain(
+    llvm_versions = {
+        "": "15.0.6",
+        "darwin-aarch64": "15.0.7",
+        "darwin-x86_64": "15.0.7",
+    },
+)
 
 use_repo(llvm, "llvm_toolchain")
 

speller/lookup/BUILD.bazel

@@ -5,8 +5,8 @@ cc_test(
     size = "small",
     srcs = ["lookup-test.cc"],
     deps = [
-        "@googletest//:gtest",
         ":lookup_lib",
+        "@googletest//:gtest_main",
     ],
 )
 

speller/main/BUILD.bazel

@@ -1,8 +1,7 @@
-load("@rules_cc//cc:defs.bzl", "cc_library")
+load("@rules_cc//cc:defs.bzl", "cc_binary")
 
-cc_library(
+cc_binary(
     name = "build-dictionary_lib",
     srcs = ["build-dictionary.cc"],
-    visibility = ["//:__subpackages__"],
     deps = ["//speller/lookup:lookup_lib"],
 )