diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-04-01 13:44:19 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-04-01 13:44:19 -0400 |
| commit | c2e8788259efd33995e151ace355cb5896cc8a85 (patch) | |
| tree | 7962a47dd9df3976a7aa8c8c5ad754d27dd55ba4 /src-self-hosted/util.zig | |
| parent | e8a1e2a1d8f2903d5951339f7d3e0dbdfc85704c (diff) | |
| parent | 2e806682f451efd26bef0486ddd980ab60de0fa1 (diff) | |
| download | zig-c2e8788259efd33995e151ace355cb5896cc8a85.tar.gz zig-c2e8788259efd33995e151ace355cb5896cc8a85.zip | |
Merge branch 'daurnimator-less-buffer'
closes #4665
Diffstat (limited to 'src-self-hosted/util.zig')
| -rw-r--r-- | src-self-hosted/util.zig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src-self-hosted/util.zig b/src-self-hosted/util.zig index 4699b453ef..6585fd7c6f 100644 --- a/src-self-hosted/util.zig +++ b/src-self-hosted/util.zig @@ -16,11 +16,11 @@ pub fn getDarwinArchString(self: Target) [:0]const u8 { } } -pub fn llvmTargetFromTriple(triple: std.Buffer) !*llvm.Target { +pub fn llvmTargetFromTriple(triple: [:0]const u8) !*llvm.Target { var result: *llvm.Target = undefined; var err_msg: [*:0]u8 = undefined; - if (llvm.GetTargetFromTriple(triple.span(), &result, &err_msg) != 0) { - std.debug.warn("triple: {s} error: {s}\n", .{ triple.span(), err_msg }); + if (llvm.GetTargetFromTriple(triple, &result, &err_msg) != 0) { + std.debug.warn("triple: {s} error: {s}\n", .{ triple, err_msg }); return error.UnsupportedTarget; } return result; @@ -34,14 +34,14 @@ pub fn initializeAllTargets() void { llvm.InitializeAllAsmParsers(); } -pub fn getLLVMTriple(allocator: *std.mem.Allocator, target: std.Target) !std.Buffer { - var result = try std.Buffer.initSize(allocator, 0); - errdefer result.deinit(); +pub fn getLLVMTriple(allocator: *std.mem.Allocator, target: std.Target) ![:0]u8 { + var result = try std.ArrayListSentineled(u8, 0).initSize(allocator, 0); + defer result.deinit(); try result.outStream().print( "{}-unknown-{}-{}", .{ @tagName(target.cpu.arch), @tagName(target.os.tag), @tagName(target.abi) }, ); - return result; + return result.toOwnedSlice(); } |
