zig

commit dd522c0c977cb2ce4d1bb1d059e1755d7c94cef5 (tree)
parent 375bab8460517f5d5ee02c161dc65ff1694132d7
Author: Jakub Konka <kubkon@jakubkonka.com>
Date:   Thu, 19 Nov 2020 18:12:55 +0100

stage2 elf: fix glibc to always specify soname

Diffstat:
M
src/glibc.zig
 | 
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/glibc.zig b/src/glibc.zig
@@ -911,13 +911,14 @@ fn buildSharedLib(
     const tracy = trace(@src());
     defer tracy.end();
 
+    const basename = try std.fmt.allocPrint(arena, "lib{s}.so.{d}", .{ lib.name, lib.sover });
     const emit_bin = Compilation.EmitLoc{
         .directory = bin_directory,
-        .basename = try std.fmt.allocPrint(arena, "lib{s}.so.{d}", .{ lib.name, lib.sover }),
+        .basename = basename,
     };
     const version: std.builtin.Version = .{ .major = lib.sover, .minor = 0, .patch = 0 };
     const ld_basename = path.basename(comp.getTarget().standardDynamicLinkerPath().get().?);
-    const soname = if (mem.eql(u8, lib.name, "ld")) ld_basename else null;
+    const soname = if (mem.eql(u8, lib.name, "ld")) ld_basename else basename;
     const map_file_path = try path.join(arena, &[_][]const u8{ bin_directory.path.?, all_map_basename });
     const c_source_files = [1]Compilation.CSourceFile{
         .{