diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2023-02-05 08:27:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-05 08:27:53 -0500 |
| commit | a5b34a61ab61882bf55d87e4cbc8186215ecf320 (patch) | |
| tree | 7b436f99dc6063e380813a0a357351f301fdbaad /lib/std/Build/TranslateCStep.zig | |
| parent | 11cc1c16fa36a7eb13cba1c43fb153ee6aca7b58 (diff) | |
| parent | b29e3fa2cd667cc967b4c7dfb5023e5ac0224d96 (diff) | |
| download | zig-a5b34a61ab61882bf55d87e4cbc8186215ecf320.tar.gz zig-a5b34a61ab61882bf55d87e4cbc8186215ecf320.zip | |
Merge pull request #14562: std.Build: enhancements to ConfigHeaderStep
Diffstat (limited to 'lib/std/Build/TranslateCStep.zig')
| -rw-r--r-- | lib/std/Build/TranslateCStep.zig | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/std/Build/TranslateCStep.zig b/lib/std/Build/TranslateCStep.zig index d9874142d8..fb0adfd0ae 100644 --- a/lib/std/Build/TranslateCStep.zig +++ b/lib/std/Build/TranslateCStep.zig @@ -15,7 +15,6 @@ builder: *std.Build, source: std.Build.FileSource, include_dirs: std.ArrayList([]const u8), c_macros: std.ArrayList([]const u8), -output_dir: ?[]const u8, out_basename: []const u8, target: CrossTarget, optimize: std.builtin.OptimizeMode, @@ -36,7 +35,6 @@ pub fn create(builder: *std.Build, options: Options) *TranslateCStep { .source = source, .include_dirs = std.ArrayList([]const u8).init(builder.allocator), .c_macros = std.ArrayList([]const u8).init(builder.allocator), - .output_dir = null, .out_basename = undefined, .target = options.target, .optimize = options.optimize, @@ -122,15 +120,10 @@ fn make(step: *Step) !void { const output_path = mem.trimRight(u8, output_path_nl, "\r\n"); self.out_basename = fs.path.basename(output_path); - if (self.output_dir) |output_dir| { - const full_dest = try fs.path.join(self.builder.allocator, &[_][]const u8{ output_dir, self.out_basename }); - try self.builder.updateFile(output_path, full_dest); - } else { - self.output_dir = fs.path.dirname(output_path).?; - } + const output_dir = fs.path.dirname(output_path).?; self.output_file.path = try fs.path.join( self.builder.allocator, - &[_][]const u8{ self.output_dir.?, self.out_basename }, + &[_][]const u8{ output_dir, self.out_basename }, ); } |
