Support Windows .exe file extensions on tools

All tool executables have the filename suffix ".exe". Fixes bazelbuild#2
tomrenn · May 31, 2024 · 9bfc6f5 · 9bfc6f5
1 parent 69f07a5
commit 9bfc6f5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/BUILD.ndk_clang.tpl b/BUILD.ndk_clang.tpl
@@ -40,6 +40,7 @@ cc_toolchain_suite(
     clang_resource_directory = "{clang_resource_directory}",
     target_system_name = target_system_name,
     toolchain_identifier = "toolchain_identifier_%s" % target_system_name,
+    tool_extension = "{tool_extension}",
 ) for target_system_name in TARGET_SYSTEM_NAMES]
 
 filegroup(
@@ -72,7 +73,7 @@ filegroup(
 [filegroup(
     name = "compiler_files_%s" % target_system_name,
     srcs = [
-        "bin/clang",
+        "bin/clang{tool_extension}",
         ":ar_files",
         ":as_files",
         ":objcopy_files",

diff --git a/ndk_cc_toolchain_config.bzl b/ndk_cc_toolchain_config.bzl
@@ -1459,17 +1459,17 @@ def ndk_cc_toolchain_config_rule_implementation(ctx):
             api_level = ctx.attr.api_level,
             target_system_name = ctx.attr.target_system_name,
             tools = {
-                "clang": "bin/clang",
-                "ar": "bin/llvm-ar",
-                "cpp": "bin/clang++",
-                "dwp": "bin/llvm-dwp",
-                "gcc": "bin/clang",
-                "gcov": "bin/gcov",
-                "ld": "bin/ld",
-                "nm": "bin/llvm-nm",
-                "objcopy": "bin/llvm-objcopy",
-                "objdump": "bin/llvm-objdump",
-                "strip": "bin/llvm-strip",
+                "clang": "bin/clang" + ctx.attr.tool_extension,
+                "ar": "bin/llvm-ar" + ctx.attr.tool_extension,
+                "cpp": "bin/clang++" + ctx.attr.tool_extension,
+                "dwp": "bin/llvm-dwp" + ctx.attr.tool_extension,
+                "gcc": "bin/clang" + ctx.attr.tool_extension,
+                "gcov": "bin/gcov" + ctx.attr.tool_extension,
+                "ld": "bin/ld" + ctx.attr.tool_extension,
+                "nm": "bin/llvm-nm" + ctx.attr.tool_extension,
+                "objcopy": "bin/llvm-objcopy" + ctx.attr.tool_extension,
+                "objdump": "bin/llvm-objdump" + ctx.attr.tool_extension,
+                "strip": "bin/llvm-strip" + ctx.attr.tool_extension,
             },
             cxx_builtin_include_directories = [
                 "sysroot/usr/include/c++/v1",
@@ -1510,6 +1510,7 @@ ndk_cc_toolchain_config_rule = rule(
             ],
         ),
         "toolchain_identifier": attr.string(mandatory = True),
+        "tool_extension": attr.string(default = ""),
     },
 )
 

diff --git a/rules.bzl b/rules.bzl
@@ -29,6 +29,7 @@ def _android_ndk_repository_impl(ctx):
              "path attribute of android_ndk_repository must be set.")
 
     is_windows = False
+    tool_extension = ""
     if ctx.os.name == "linux":
         clang_directory = "toolchains/llvm/prebuilt/linux-x86_64"
     elif ctx.os.name == "mac os x":
@@ -37,6 +38,7 @@ def _android_ndk_repository_impl(ctx):
     elif ctx.os.name.startswith("windows"):
         clang_directory = "toolchains/llvm/prebuilt/windows-x86_64"
         is_windows = True
+        tool_extension = ".exe"
     else:
         fail("Unsupported operating system: " + ctx.os.name)
 
@@ -83,6 +85,7 @@ def _android_ndk_repository_impl(ctx):
             "{api_level}": str(api_level),
             "{clang_resource_directory}": clang_resource_directory,
             "{sysroot_directory}": sysroot_directory,
+            "{tool_extension}": tool_extension,
         },
         executable = False,
     )