authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-11-19 13:09:30+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-11-27 15:42:39-07:00
log12efefeba5a8128e0a79b4b04fad0d538c382e47
tree249e902312da17f0c06e100fec6ff1e79536d6ef
parent9e4360c335c543ad4ff80791257eabfc556f3ac1

stage2 elf: make -soname an opt-in and not opt-out

As discussed with LemonBoy, it makes more sense to have the `-soname` an opt-in option rather than opt-out, which is especially true if we are to align `zig cc` with `cc` to a greater degree.

1 files changed, 4 insertions(+), 7 deletions(-)

src/link/Elf.zig+4-7
...@@ -1512,13 +1512,10 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {...@@ -1512,13 +1512,10 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {
1512 }1512 }
15131513
1514 if (is_dyn_lib) {1514 if (is_dyn_lib) {
1515 const soname = self.base.options.override_soname orelse if (self.base.options.version) |ver|1515 if (self.base.options.override_soname) |soname| {
1516 try std.fmt.allocPrint(arena, "lib{}.so.{}", .{ self.base.options.root_name, ver.major })1516 try argv.append("-soname");
1517 else1517 try argv.append(soname);
1518 try std.fmt.allocPrint(arena, "lib{}.so", .{self.base.options.root_name});1518 }
1519 try argv.append("-soname");
1520 try argv.append(soname);
1521
1522 if (self.base.options.version_script) |version_script| {1519 if (self.base.options.version_script) |version_script| {
1523 try argv.append("-version-script");1520 try argv.append("-version-script");
1524 try argv.append(version_script);1521 try argv.append(version_script);