Merge pull request #141 from aherrmann/static-lib-prefix

fix: generate static archives with a lib prefix
aherrmann · Dec 2, 2023 · 12eb068 · 12eb068
2 parents 92ee8fc + 0dfd0f0
commit 12eb068
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/zig/private/common/zig_build.bzl b/zig/private/common/zig_build.bzl
@@ -121,8 +121,9 @@ def zig_build_impl(ctx, *, kind):
  files = depset([output])
  direct_data.append(output)
  elif kind == "zig_library":
+ prefix = "" if zigtargetinfo.triple.os == "windows" else "lib"
  extension = ".lib" if zigtargetinfo.triple.os == "windows" else ".a"
- static = ctx.actions.declare_file(ctx.label.name + extension)
+ static = ctx.actions.declare_file(prefix + ctx.label.name + extension)
  outputs.append(static)
  args.add(static, format = "-femit-bin=%s")
 

diff --git a/zig/tests/target_platform_test.bzl b/zig/tests/target_platform_test.bzl
@@ -91,7 +91,7 @@ def _define_file_extension_test(target, extension, basename_pattern = "%s"):
 _exe_file_extension_x86_64_linux_test = _define_file_extension_test(_PLATFORM_X86_64_LINUX, "")
 _exe_file_extension_x86_64_windows_test = _define_file_extension_test(_PLATFORM_X86_64_WINDOWS, ".exe")
 
-_lib_file_extension_x86_64_linux_test = _define_file_extension_test(_PLATFORM_X86_64_LINUX, ".a")
+_lib_file_extension_x86_64_linux_test = _define_file_extension_test(_PLATFORM_X86_64_LINUX, ".a", basename_pattern = "lib%s")
 _lib_file_extension_x86_64_windows_test = _define_file_extension_test(_PLATFORM_X86_64_WINDOWS, ".lib")
 
 _shared_lib_file_extension_x86_64_linux_test = _define_file_extension_test(_PLATFORM_X86_64_LINUX, ".so", basename_pattern = "lib%s")