authorgravatar for quae@daurnimator.comdaurnimator <quae@daurnimator.com> 2020-03-07 15:35:06+11:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-04-01 10:36:38-04:00
logecbc235403eb424a40e111a8789ae3a32fd14edd
treea796fce49d01164d2e04233550e5748b2839175a
parentbb5383cf00b3a518f9101f1503681aff510cdcbb
signaturelock-open Commit is signed but in an unrecognized format.

std: use std.ArrayList(u8) instead of std.Buffer in std/build.zig

1 files changed, 11 insertions(+), 10 deletions(-)

lib/std/build.zig+11-10
...@@ -1139,7 +1139,7 @@ pub const LibExeObjStep = struct {...@@ -1139,7 +1139,7 @@ pub const LibExeObjStep = struct {
1139 out_lib_filename: []const u8,1139 out_lib_filename: []const u8,
1140 out_pdb_filename: []const u8,1140 out_pdb_filename: []const u8,
1141 packages: ArrayList(Pkg),1141 packages: ArrayList(Pkg),
1142 build_options_contents: std.Buffer,1142 build_options_contents: std.ArrayList(u8),
1143 system_linker_hack: bool = false,1143 system_linker_hack: bool = false,
11441144
1145 object_src: []const u8,1145 object_src: []const u8,
...@@ -1274,7 +1274,7 @@ pub const LibExeObjStep = struct {...@@ -1274,7 +1274,7 @@ pub const LibExeObjStep = struct {
1274 .lib_paths = ArrayList([]const u8).init(builder.allocator),1274 .lib_paths = ArrayList([]const u8).init(builder.allocator),
1275 .framework_dirs = ArrayList([]const u8).init(builder.allocator),1275 .framework_dirs = ArrayList([]const u8).init(builder.allocator),
1276 .object_src = undefined,1276 .object_src = undefined,
1277 .build_options_contents = std.Buffer.initSize(builder.allocator, 0) catch unreachable,1277 .build_options_contents = std.ArrayList(u8).init(builder.allocator),
1278 .c_std = Builder.CStd.C99,1278 .c_std = Builder.CStd.C99,
1279 .override_lib_dir = null,1279 .override_lib_dir = null,
1280 .main_pkg_path = null,1280 .main_pkg_path = null,
...@@ -1847,7 +1847,7 @@ pub const LibExeObjStep = struct {...@@ -1847,7 +1847,7 @@ pub const LibExeObjStep = struct {
1847 }1847 }
1848 }1848 }
18491849
1850 if (self.build_options_contents.len() > 0) {1850 if (self.build_options_contents.len > 0) {
1851 const build_options_file = try fs.path.join(1851 const build_options_file = try fs.path.join(
1852 builder.allocator,1852 builder.allocator,
1853 &[_][]const u8{ builder.cache_root, builder.fmt("{}_build_options.zig", .{self.name}) },1853 &[_][]const u8{ builder.cache_root, builder.fmt("{}_build_options.zig", .{self.name}) },
...@@ -1960,22 +1960,23 @@ pub const LibExeObjStep = struct {...@@ -1960,22 +1960,23 @@ pub const LibExeObjStep = struct {
1960 try zig_args.append(cross.cpu.model.name);1960 try zig_args.append(cross.cpu.model.name);
1961 }1961 }
1962 } else {1962 } else {
1963 var mcpu_buffer = try std.Buffer.init(builder.allocator, "-mcpu=");1963 var mcpu_buffer = std.ArrayList(u8).init(builder.allocator);
1964 try mcpu_buffer.append(cross.cpu.model.name);1964 errdefer mcpu_buffer.deinit();
1965
1966 try mcpu_buffer.outStream().print("-mcpu={}", .{cross.cpu.model.name});
19651967
1966 for (all_features) |feature, i_usize| {1968 for (all_features) |feature, i_usize| {
1967 const i = @intCast(std.Target.Cpu.Feature.Set.Index, i_usize);1969 const i = @intCast(std.Target.Cpu.Feature.Set.Index, i_usize);
1968 const in_cpu_set = populated_cpu_features.isEnabled(i);1970 const in_cpu_set = populated_cpu_features.isEnabled(i);
1969 const in_actual_set = cross.cpu.features.isEnabled(i);1971 const in_actual_set = cross.cpu.features.isEnabled(i);
1970 if (in_cpu_set and !in_actual_set) {1972 if (in_cpu_set and !in_actual_set) {
1971 try mcpu_buffer.appendByte('-');1973 try mcpu_buffer.outStream().print("-{}", .{feature.name});
1972 try mcpu_buffer.append(feature.name);
1973 } else if (!in_cpu_set and in_actual_set) {1974 } else if (!in_cpu_set and in_actual_set) {
1974 try mcpu_buffer.appendByte('+');1975 try mcpu_buffer.outStream().print("+{}", .{feature.name});
1975 try mcpu_buffer.append(feature.name);
1976 }1976 }
1977 }1977 }
1978 try zig_args.append(mcpu_buffer.span());1978
1979 try zig_args.append(mcpu_buffer.toOwnedSlice());
1979 }1980 }
19801981
1981 if (self.target.dynamic_linker.get()) |dynamic_linker| {1982 if (self.target.dynamic_linker.get()) |dynamic_linker| {