authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2021-06-11 21:09:33+03:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2021-06-12 14:23:07+03:00
log2b2efa24d08551bdb1ea58a39429bf2a5493b1b4
tree92497139eff4a9001f0413b8eecede8660a2516b
parent05b5e49bc07b7c26dc1eea28d6a4a3a1cb42585e

std.build: don't default to static linkage

4 files changed, 25 insertions(+), 23 deletions(-)

lib/std/build.zig+21-19
......@@ -214,11 +214,11 @@ pub const Builder = struct {
214214 }
215215
216216 pub fn addExecutable(self: *Builder, name: []const u8, root_src: ?[]const u8) *LibExeObjStep {
217 return addExecutableSource(self, name, convertOptionalPathToFileSource(root_src), .static);
217 return addExecutableSource(self, name, convertOptionalPathToFileSource(root_src));
218218 }
219219
220 pub fn addExecutableSource(builder: *Builder, name: []const u8, root_src: ?FileSource, linkage: LibExeObjStep.Linkage) *LibExeObjStep {
221 return LibExeObjStep.createExecutable(builder, name, root_src, linkage);
220 pub fn addExecutableSource(builder: *Builder, name: []const u8, root_src: ?FileSource) *LibExeObjStep {
221 return LibExeObjStep.createExecutable(builder, name, root_src);
222222 }
223223
224224 pub fn addObject(self: *Builder, name: []const u8, root_src: ?[]const u8) *LibExeObjStep {
......@@ -1363,7 +1363,7 @@ pub const LibExeObjStep = struct {
13631363 linker_script: ?FileSource = null,
13641364 version_script: ?[]const u8 = null,
13651365 out_filename: []const u8,
1366 linkage: Linkage,
1366 linkage: ?Linkage = null,
13671367 version: ?Version,
13681368 build_mode: builtin.Mode,
13691369 kind: Kind,
......@@ -1517,15 +1517,15 @@ pub const LibExeObjStep = struct {
15171517 }
15181518
15191519 pub fn createObject(builder: *Builder, name: []const u8, root_src: ?FileSource) *LibExeObjStep {
1520 return initExtraArgs(builder, name, root_src, .obj, .static, null);
1520 return initExtraArgs(builder, name, root_src, .obj, null, null);
15211521 }
15221522
1523 pub fn createExecutable(builder: *Builder, name: []const u8, root_src: ?FileSource, linkage: Linkage) *LibExeObjStep {
1524 return initExtraArgs(builder, name, root_src, .exe, linkage, null);
1523 pub fn createExecutable(builder: *Builder, name: []const u8, root_src: ?FileSource) *LibExeObjStep {
1524 return initExtraArgs(builder, name, root_src, .exe, null, null);
15251525 }
15261526
15271527 pub fn createTest(builder: *Builder, name: []const u8, root_src: FileSource) *LibExeObjStep {
1528 return initExtraArgs(builder, name, root_src, .@"test", .static, null);
1528 return initExtraArgs(builder, name, root_src, .@"test", null, null);
15291529 }
15301530
15311531 fn initExtraArgs(
......@@ -1533,7 +1533,7 @@ pub const LibExeObjStep = struct {
15331533 name_raw: []const u8,
15341534 root_src_raw: ?FileSource,
15351535 kind: Kind,
1536 linkage: Linkage,
1536 linkage: ?Linkage,
15371537 ver: ?Version,
15381538 ) *LibExeObjStep {
15391539 const name = builder.dupe(name_raw);
......@@ -1613,15 +1613,15 @@ pub const LibExeObjStep = struct {
16131613 .obj => .Obj,
16141614 .exe, .@"test" => .Exe,
16151615 },
1616 .link_mode = switch (self.linkage) {
1616 .link_mode = if (self.linkage) |some| @as(std.builtin.LinkMode, switch (some) {
16171617 .dynamic => .Dynamic,
16181618 .static => .Static,
1619 },
1619 }) else null,
16201620 .version = self.version,
16211621 }) catch unreachable;
16221622
16231623 if (self.kind == .lib) {
1624 if (self.linkage == .static) {
1624 if (self.linkage != null and self.linkage.? == .static) {
16251625 self.out_lib_filename = self.out_filename;
16261626 } else if (self.version) |version| {
16271627 if (target.isDarwin()) {
......@@ -1725,7 +1725,7 @@ pub const LibExeObjStep = struct {
17251725 }
17261726
17271727 pub fn isDynamicLibrary(self: *LibExeObjStep) bool {
1728 return self.kind == .lib and self.linkage == .dynamic;
1728 return self.kind == .lib and self.linkage != null and self.linkage.? == .dynamic;
17291729 }
17301730
17311731 pub fn producesPdbFile(self: *LibExeObjStep) bool {
......@@ -2298,7 +2298,7 @@ pub const LibExeObjStep = struct {
22982298 const full_path_lib = other.getOutputLibSource().getPath(builder);
22992299 try zig_args.append(full_path_lib);
23002300
2301 if (other.linkage == .dynamic and !self.target.isWindows()) {
2301 if (other.linkage != null and other.linkage.? == .dynamic and !self.target.isWindows()) {
23022302 if (fs.path.dirname(full_path_lib)) |dirname| {
23032303 try zig_args.append("-rpath");
23042304 try zig_args.append(dirname);
......@@ -2464,15 +2464,17 @@ pub const LibExeObjStep = struct {
24642464 zig_args.append("--name") catch unreachable;
24652465 zig_args.append(self.name) catch unreachable;
24662466
2467 if (self.kind == .lib and self.linkage == .dynamic) {
2467 if (self.linkage) |some| switch (some) {
2468 .dynamic => try zig_args.append("-dynamic"),
2469 .static => try zig_args.append("-static"),
2470 };
2471 if (self.kind == .lib and self.linkage != null and self.linkage.? == .dynamic) {
24682472 if (self.version) |version| {
24692473 zig_args.append("--version") catch unreachable;
24702474 zig_args.append(builder.fmt("{}", .{version})) catch unreachable;
24712475 }
24722476 }
2473 if (self.linkage == .dynamic) {
2474 try zig_args.append("-dynamic");
2475 }
2477
24762478 if (self.bundle_compiler_rt) |x| {
24772479 if (x) {
24782480 try zig_args.append("-fcompiler-rt");
......@@ -2801,7 +2803,7 @@ pub const LibExeObjStep = struct {
28012803 }
28022804 }
28032805
2804 if (self.kind == .lib and self.linkage == .dynamic and self.version != null and self.target.wantSharedLibSymLinks()) {
2806 if (self.kind == .lib and self.linkage != null and self.linkage.? == .dynamic and self.version != null and self.target.wantSharedLibSymLinks()) {
28052807 try doAtomicSymLinks(builder.allocator, self.getOutputSource().getPath(builder), self.major_only_filename.?, self.name_only_filename.?);
28062808 }
28072809 }
lib/std/build/TranslateCStep.zig+1-1
......@@ -47,7 +47,7 @@ pub fn setTarget(self: *TranslateCStep, target: CrossTarget) void {
4747
4848/// Creates a step to build an executable from the translated source.
4949pub fn addExecutable(self: *TranslateCStep) *LibExeObjStep {
50 return self.builder.addExecutableSource("translated_c", build.FileSource{ .generated = &self.output_file }, .static);
50 return self.builder.addExecutableSource("translated_c", build.FileSource{ .generated = &self.output_file });
5151}
5252
5353pub fn addIncludeDir(self: *TranslateCStep, include_dir: []const u8) void {
test/src/compare_output.zig+2-2
......@@ -126,7 +126,7 @@ pub const CompareOutputContext = struct {
126126 }
127127
128128 const basename = case.sources.items[0].filename;
129 const exe = b.addExecutableSource("test", write_src.getFileSource(basename).?, .static);
129 const exe = b.addExecutableSource("test", write_src.getFileSource(basename).?);
130130 exe.setBuildMode(mode);
131131 if (case.link_libc) {
132132 exe.linkSystemLibrary("c");
......@@ -147,7 +147,7 @@ pub const CompareOutputContext = struct {
147147 }
148148
149149 const basename = case.sources.items[0].filename;
150 const exe = b.addExecutableSource("test", write_src.getFileSource(basename).?, .static);
150 const exe = b.addExecutableSource("test", write_src.getFileSource(basename).?);
151151 if (case.link_libc) {
152152 exe.linkSystemLibrary("c");
153153 }
test/tests.zig+1-1
......@@ -656,7 +656,7 @@ pub const StackTracesContext = struct {
656656 const b = self.b;
657657 const src_basename = "source.zig";
658658 const write_src = b.addWriteFile(src_basename, source);
659 const exe = b.addExecutableSource("test", write_src.getFileSource(src_basename).?, .static);
659 const exe = b.addExecutableSource("test", write_src.getFileSource(src_basename).?);
660660 exe.setBuildMode(mode);
661661
662662 const run_and_compare = RunAndCompareStep.create(