diff --git a/lib/std/build.zig b/lib/std/build.zig index 88fd41a48b..754f454005 100644 --- a/lib/std/build.zig +++ b/lib/std/build.zig @@ -1591,6 +1591,13 @@ pub const LibExeObjStep = struct { self.out_lib_filename = self.out_filename; } } + if (self.output_dir != null) { + self.output_lib_path_source.path = + fs.path.join( + self.builder.allocator, + &[_][]const u8{ self.output_dir.?, self.out_lib_filename }, + ) catch unreachable; + } } } @@ -2132,6 +2139,12 @@ pub const LibExeObjStep = struct { self.link_objects.append(LinkObject{ .other_step = other }) catch unreachable; self.include_dirs.append(IncludeDir{ .other_step = other }) catch unreachable; + // BUG: The following code introduces a order-of-call dependency: + // var lib = addSharedLibrary(...); + // var exe = addExecutable(...); + // exe.linkLibrary(lib); + // lib.linkSystemLibrary("foobar"); // this will be ignored for exe! + // Inherit dependency on system libraries for (other.link_objects.items) |link_object| { switch (link_object) { @@ -2174,28 +2187,6 @@ pub const LibExeObjStep = struct { return error.NeedAnObject; } - // Update generated files - self.output_path_source.path = - fs.path.join( - self.builder.allocator, - &[_][]const u8{ self.output_dir.?, self.out_filename }, - ) catch unreachable; - self.output_lib_path_source.path = - fs.path.join( - self.builder.allocator, - &[_][]const u8{ self.output_dir.?, self.out_lib_filename }, - ) catch unreachable; - self.output_h_path_source.path = - fs.path.join( - self.builder.allocator, - &[_][]const u8{ self.output_dir.?, self.out_h_filename }, - ) catch unreachable; - self.output_pdb_path_source.path = - fs.path.join( - self.builder.allocator, - &[_][]const u8{ self.output_dir.?, self.out_pdb_filename }, - ) catch unreachable; - var zig_args = ArrayList([]const u8).init(builder.allocator); defer zig_args.deinit(); @@ -2711,6 +2702,34 @@ pub const LibExeObjStep = struct { } } + // This will ensure all output filenames will now have the output_dir available! + self.computeOutFileNames(); + + // Update generated files + if (self.output_dir != null) { + self.output_path_source.path = + fs.path.join( + self.builder.allocator, + &[_][]const u8{ self.output_dir.?, self.out_filename }, + ) catch unreachable; + + if (self.emit_h) { + self.output_h_path_source.path = + fs.path.join( + self.builder.allocator, + &[_][]const u8{ self.output_dir.?, self.out_h_filename }, + ) catch unreachable; + } + + if (self.target.isWindows() or self.target.isUefi()) { + self.output_pdb_path_source.path = + fs.path.join( + self.builder.allocator, + &[_][]const u8{ self.output_dir.?, self.out_pdb_filename }, + ) catch unreachable; + } + } + if (self.kind == .Lib and self.linkage == .dynamic and self.version != null and self.target.wantSharedLibSymLinks()) { try doAtomicSymLinks(builder.allocator, self.getOutputSource().getPath(builder), self.major_only_filename.?, self.name_only_filename.?); } diff --git a/lib/std/build/RunStep.zig b/lib/std/build/RunStep.zig index 08408b4840..befb803342 100644 --- a/lib/std/build/RunStep.zig +++ b/lib/std/build/RunStep.zig @@ -112,9 +112,9 @@ pub fn addPathDir(self: *RunStep, search_path: []const u8) void { if (prev_path) |pp| { const new_path = self.builder.fmt("{s}" ++ [1]u8{fs.path.delimiter} ++ "{s}", .{ pp, search_path }); - env_map.set(key, new_path) catch unreachable; + env_map.put(key, new_path) catch unreachable; } else { - env_map.set(key, self.builder.dupePath(search_path)) catch unreachable; + env_map.put(key, self.builder.dupePath(search_path)) catch unreachable; } } @@ -129,7 +129,7 @@ pub fn getEnvMap(self: *RunStep) *BufMap { pub fn setEnvironmentVariable(self: *RunStep, key: []const u8, value: []const u8) void { const env_map = self.getEnvMap(); - env_map.set( + env_map.put( self.builder.dupe(key), self.builder.dupe(value), ) catch unreachable; diff --git a/lib/std/build/TranslateCStep.zig b/lib/std/build/TranslateCStep.zig index 60f648215b..c959205d9a 100644 --- a/lib/std/build/TranslateCStep.zig +++ b/lib/std/build/TranslateCStep.zig @@ -89,7 +89,7 @@ fn make(step: *Step) !void { self.output_dir = fs.path.dirname(output_path).?; } - self.source.path = fs.path.join( + self.output_file.path = fs.path.join( self.builder.allocator, &[_][]const u8{ self.output_dir.?, self.out_basename }, ) catch unreachable; diff --git a/lib/std/build/run.zig b/lib/std/build/run.zig deleted file mode 100644 index a9d4e425dd..0000000000 --- a/lib/std/build/run.zig +++ /dev/null @@ -1,327 +0,0 @@ -// SPDX-License-Identifier: MIT -// Copyright (c) 2015-2021 Zig Contributors -// This file is part of [zig](https://ziglang.org/), which is MIT licensed. -// The MIT license requires this copyright notice to be included in all copies -// and substantial portions of the software. -const std = @import("../std.zig"); -const builtin = std.builtin; -const build = std.build; -const Step = build.Step; -const Builder = build.Builder; -const LibExeObjStep = build.LibExeObjStep; -const WriteFileStep = build.WriteFileStep; -const fs = std.fs; -const mem = std.mem; -const process = std.process; -const ArrayList = std.ArrayList; -const BufMap = std.BufMap; -const warn = std.debug.warn; - -const max_stdout_size = 1 * 1024 * 1024; // 1 MiB - -pub const RunStep = struct { - step: Step, - builder: *Builder, - - /// See also addArg and addArgs to modifying this directly - argv: ArrayList(Arg), - - /// Set this to modify the current working directory - cwd: ?[]const u8, - - /// Override this field to modify the environment, or use setEnvironmentVariable - env_map: ?*BufMap, - - stdout_action: StdIoAction = .inherit, - stderr_action: StdIoAction = .inherit, - - stdin_behavior: std.ChildProcess.StdIo = .Inherit, - - expected_exit_code: u8 = 0, - - pub const StdIoAction = union(enum) { - inherit, - ignore, - expect_exact: []const u8, - expect_matches: []const []const u8, - }; - - pub const Arg = union(enum) { - artifact: *LibExeObjStep, - file_source: build.FileSource, - bytes: []u8, - }; - - pub fn create(builder: *Builder, name: []const u8) *RunStep { - const self = builder.allocator.create(RunStep) catch unreachable; - self.* = RunStep{ - .builder = builder, - .step = Step.init(.Run, name, builder.allocator, make), - .argv = ArrayList(Arg).init(builder.allocator), - .cwd = null, - .env_map = null, - }; - return self; - } - - pub fn addArtifactArg(self: *RunStep, artifact: *LibExeObjStep) void { - self.argv.append(Arg{ .artifact = artifact }) catch unreachable; - self.step.dependOn(&artifact.step); - } - - pub fn addFileSourceArg(self: *RunStep, file_source: build.FileSource) void { - self.argv.append(Arg{ - .file_source = file_source.dupe(self.builder), - }) catch unreachable; - file_source.addStepDependencies(&self.step); - } - - pub fn addArg(self: *RunStep, arg: []const u8) void { - self.argv.append(Arg{ .bytes = self.builder.dupe(arg) }) catch unreachable; - } - - pub fn addArgs(self: *RunStep, args: []const []const u8) void { - for (args) |arg| { - self.addArg(arg); - } - } - - pub fn clearEnvironment(self: *RunStep) void { - const new_env_map = self.builder.allocator.create(BufMap) catch unreachable; - new_env_map.* = BufMap.init(self.builder.allocator); - self.env_map = new_env_map; - } - - pub fn addPathDir(self: *RunStep, search_path: []const u8) void { - const env_map = self.getEnvMap(); - - var key: []const u8 = undefined; - var prev_path: ?[]const u8 = undefined; - if (builtin.os.tag == .windows) { - key = "Path"; - prev_path = env_map.get(key); - if (prev_path == null) { - key = "PATH"; - prev_path = env_map.get(key); - } - } else { - key = "PATH"; - prev_path = env_map.get(key); - } - - if (prev_path) |pp| { - const new_path = self.builder.fmt("{s}" ++ [1]u8{fs.path.delimiter} ++ "{s}", .{ pp, search_path }); - env_map.put(key, new_path) catch unreachable; - } else { - env_map.put(key, self.builder.dupePath(search_path)) catch unreachable; - } - } - - pub fn getEnvMap(self: *RunStep) *BufMap { - return self.env_map orelse { - const env_map = self.builder.allocator.create(BufMap) catch unreachable; - env_map.* = process.getEnvMap(self.builder.allocator) catch unreachable; - self.env_map = env_map; - return env_map; - }; - } - - pub fn setEnvironmentVariable(self: *RunStep, key: []const u8, value: []const u8) void { - const env_map = self.getEnvMap(); - // Note: no need to dupe these strings because BufMap does it internally. - env_map.put(key, value) catch unreachable; - } - - pub fn expectStdErrEqual(self: *RunStep, bytes: []const u8) void { - self.stderr_action = .{ .expect_exact = self.builder.dupe(bytes) }; - } - - pub fn expectStdOutEqual(self: *RunStep, bytes: []const u8) void { - self.stdout_action = .{ .expect_exact = self.builder.dupe(bytes) }; - } - - fn stdIoActionToBehavior(action: StdIoAction) std.ChildProcess.StdIo { - return switch (action) { - .ignore => .Ignore, - .inherit => .Inherit, - .expect_exact, .expect_matches => .Pipe, - }; - } - - fn make(step: *Step) !void { - const self = @fieldParentPtr(RunStep, "step", step); - - const cwd = if (self.cwd) |cwd| self.builder.pathFromRoot(cwd) else self.builder.build_root; - - var argv_list = ArrayList([]const u8).init(self.builder.allocator); - for (self.argv.items) |arg| { - switch (arg) { - .bytes => |bytes| try argv_list.append(bytes), - .file_source => |file| try argv_list.append(file.getPath(self.builder)), - .artifact => |artifact| { - if (artifact.target.isWindows()) { - // On Windows we don't have rpaths so we have to add .dll search paths to PATH - self.addPathForDynLibs(artifact); - } - const executable_path = artifact.installed_path orelse artifact.getOutputPath(); - try argv_list.append(executable_path); - }, - } - } - - const argv = argv_list.items; - - const child = std.ChildProcess.init(argv, self.builder.allocator) catch unreachable; - defer child.deinit(); - - child.cwd = cwd; - child.env_map = self.env_map orelse self.builder.env_map; - - child.stdin_behavior = self.stdin_behavior; - child.stdout_behavior = stdIoActionToBehavior(self.stdout_action); - child.stderr_behavior = stdIoActionToBehavior(self.stderr_action); - - if (self.builder.verbose) { - for (argv) |arg| { - warn("{s} ", .{arg}); - } - warn("\n", .{}); - } - - child.spawn() catch |err| { - warn("Unable to spawn {s}: {s}\n", .{ argv[0], @errorName(err) }); - return err; - }; - - // TODO need to poll to read these streams to prevent a deadlock (or rely on evented I/O). - - var stdout: ?[]const u8 = null; - defer if (stdout) |s| self.builder.allocator.free(s); - - switch (self.stdout_action) { - .expect_exact, .expect_matches => { - stdout = child.stdout.?.reader().readAllAlloc(self.builder.allocator, max_stdout_size) catch unreachable; - }, - .inherit, .ignore => {}, - } - - var stderr: ?[]const u8 = null; - defer if (stderr) |s| self.builder.allocator.free(s); - - switch (self.stderr_action) { - .expect_exact, .expect_matches => { - stderr = child.stderr.?.reader().readAllAlloc(self.builder.allocator, max_stdout_size) catch unreachable; - }, - .inherit, .ignore => {}, - } - - const term = child.wait() catch |err| { - warn("Unable to spawn {s}: {s}\n", .{ argv[0], @errorName(err) }); - return err; - }; - - switch (term) { - .Exited => |code| { - if (code != self.expected_exit_code) { - warn("The following command exited with error code {} (expected {}):\n", .{ - code, - self.expected_exit_code, - }); - printCmd(cwd, argv); - return error.UncleanExit; - } - }, - else => { - warn("The following command terminated unexpectedly:\n", .{}); - printCmd(cwd, argv); - return error.UncleanExit; - }, - } - - switch (self.stderr_action) { - .inherit, .ignore => {}, - .expect_exact => |expected_bytes| { - if (!mem.eql(u8, expected_bytes, stderr.?)) { - warn( - \\ - \\========= Expected this stderr: ========= - \\{s} - \\========= But found: ==================== - \\{s} - \\ - , .{ expected_bytes, stderr.? }); - printCmd(cwd, argv); - return error.TestFailed; - } - }, - .expect_matches => |matches| for (matches) |match| { - if (mem.indexOf(u8, stderr.?, match) == null) { - warn( - \\ - \\========= Expected to find in stderr: ========= - \\{s} - \\========= But stderr does not contain it: ===== - \\{s} - \\ - , .{ match, stderr.? }); - printCmd(cwd, argv); - return error.TestFailed; - } - }, - } - - switch (self.stdout_action) { - .inherit, .ignore => {}, - .expect_exact => |expected_bytes| { - if (!mem.eql(u8, expected_bytes, stdout.?)) { - warn( - \\ - \\========= Expected this stdout: ========= - \\{s} - \\========= But found: ==================== - \\{s} - \\ - , .{ expected_bytes, stdout.? }); - printCmd(cwd, argv); - return error.TestFailed; - } - }, - .expect_matches => |matches| for (matches) |match| { - if (mem.indexOf(u8, stdout.?, match) == null) { - warn( - \\ - \\========= Expected to find in stdout: ========= - \\{s} - \\========= But stdout does not contain it: ===== - \\{s} - \\ - , .{ match, stdout.? }); - printCmd(cwd, argv); - return error.TestFailed; - } - }, - } - } - - fn printCmd(cwd: ?[]const u8, argv: []const []const u8) void { - if (cwd) |yes_cwd| warn("cd {s} && ", .{yes_cwd}); - for (argv) |arg| { - warn("{s} ", .{arg}); - } - warn("\n", .{}); - } - - fn addPathForDynLibs(self: *RunStep, artifact: *LibExeObjStep) void { - for (artifact.link_objects.items) |link_object| { - switch (link_object) { - .other_step => |other| { - if (other.target.isWindows() and other.isDynamicLibrary()) { - self.addPathDir(fs.path.dirname(other.getOutputPath()).?); - self.addPathForDynLibs(other); - } - }, - else => {}, - } - } - } -};