diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-08-07 11:14:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-07 11:14:45 -0700 |
| commit | d94252496e6622189fca72ad6d6b17db0dcb2e03 (patch) | |
| tree | be8281fdcdb48d4e1ec700666f6c8259191eb5df /src/Compilation.zig | |
| parent | 259f3458a162120288eb80dea4e55cd4ed9cf4c5 (diff) | |
| parent | d31352ee85d633876877d87b813cd3611aa17d88 (diff) | |
| download | zig-d94252496e6622189fca72ad6d6b17db0dcb2e03.tar.gz zig-d94252496e6622189fca72ad6d6b17db0dcb2e03.zip | |
Merge pull request #9531 from squeek502/split-tokenize-generic
Make mem.split and mem.tokenize generic instead of assuming u8
Diffstat (limited to 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 4e9d94c6a4..a80849b26e 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -3341,7 +3341,7 @@ pub fn hasSharedLibraryExt(filename: []const u8) bool { return true; } // Look for .so.X, .so.X.Y, .so.X.Y.Z - var it = mem.split(filename, "."); + var it = mem.split(u8, filename, "."); _ = it.next().?; var so_txt = it.next() orelse return false; while (!mem.eql(u8, so_txt, "so")) { @@ -4086,7 +4086,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node }; if (directory.handle.readFileAlloc(comp.gpa, libs_txt_basename, 10 * 1024 * 1024)) |libs_txt| { - var it = mem.tokenize(libs_txt, "\n"); + var it = mem.tokenize(u8, libs_txt, "\n"); while (it.next()) |lib_name| { try comp.stage1AddLinkLib(lib_name); } |