From 1ae4cf6748b00fc668f6f225859809b25d1069ce Mon Sep 17 00:00:00 2001
From: Philipp Stephani <p.stephani2@gmail.com>
Date: Fri, 10 Apr 2026 10:56:10 +0200
Subject: [PATCH] Directly emit modules with the correct filename
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With newer versions of rules_cc, the main_output parameter became
public (https://github.com/bazelbuild/rules_cc/pull/578), so we don’t have to
create a symlink to produce the correct filename.
---
 elisp/elisp_cc_module.bzl | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/elisp/elisp_cc_module.bzl b/elisp/elisp_cc_module.bzl
index 140366e02..81a57858f 100644
--- a/elisp/elisp_cc_module.bzl
+++ b/elisp/elisp_cc_module.bzl
@@ -1,4 +1,4 @@
-# Copyright 2020-2025 Google LLC
+# Copyright 2020-2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,6 +47,10 @@ def _elisp_cc_module_impl(ctx):
         local_defines = defaults.defines + ctx.attr.local_defines,
         user_compile_flags = defaults.copts + ctx.attr.copts,
     )
+
+    # Ensure that the library file has the expected name.
+    filename = ctx.label.name + config.suffix
+    lib = ctx.actions.declare_file(filename)
     out = cc_common.link(
         name = ctx.label.name,
         actions = ctx.actions,
@@ -55,24 +59,13 @@ def _elisp_cc_module_impl(ctx):
         compilation_outputs = objs,
         linking_contexts = [info.linking_context for info in infos],
         output_type = "dynamic_library",
+        main_output = lib,
         user_link_flags = defaults.linkopts + ctx.attr.linkopts,
         additional_inputs = config.additional_linker_inputs,
     )
     if not (out.library_to_link and out.library_to_link.dynamic_library):
         fail("linking Emacs module didn’t produce a dynamic library")
 
-    # Ensure that the library file has the expected name.
-    filename = ctx.label.name + config.suffix
-    if out.library_to_link.dynamic_library.basename == filename:
-        lib = out.library_to_link.dynamic_library
-    else:
-        lib = ctx.actions.declare_file(filename)
-        ctx.actions.symlink(
-            output = lib,
-            target_file = out.library_to_link.dynamic_library,
-            progress_message = "Creating symbolic link " + lib.short_path,
-        )
-
     # Replicate some implementation details of cc_binary to make coverage work,
     # at least with llvm-cov.  See
     # https://github.com/bazelbuild/bazel/issues/15974.