diff options
| author | Alex Rønne Petersen <alex@alexrp.com> | 2025-05-29 23:27:26 +0200 |
|---|---|---|
| committer | Alex Rønne Petersen <alex@alexrp.com> | 2025-05-30 00:15:37 +0200 |
| commit | 7c7627b18a85a1ab7e09b6dadfc9bba0903880db (patch) | |
| tree | b1ca9e2937cedf8a4f64738f42d5b3897b37d461 /src/libs | |
| parent | dc760492a44a3e494943f9191efbd6ded291af87 (diff) | |
| download | zig-7c7627b18a85a1ab7e09b6dadfc9bba0903880db.tar.gz zig-7c7627b18a85a1ab7e09b6dadfc9bba0903880db.zip | |
compiler: Use new merged header paths for glibc and NetBSD libc.
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/glibc.zig | 5 | ||||
| -rw-r--r-- | src/libs/netbsd.zig | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/libs/glibc.zig b/src/libs/glibc.zig index 0a3185f380..cc781c5472 100644 --- a/src/libs/glibc.zig +++ b/src/libs/glibc.zig @@ -463,7 +463,10 @@ fn add_include_dirs(comp: *Compilation, arena: Allocator, args: *std.ArrayList([ try args.append("-I"); try args.append(try std.fmt.allocPrint(arena, "{s}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "{s}-{s}-{s}", .{ - comp.dirs.zig_lib.path orelse ".", @tagName(target.cpu.arch), @tagName(target.os.tag), @tagName(target.abi), + comp.dirs.zig_lib.path orelse ".", + std.zig.target.glibcArchNameHeaders(target.cpu.arch), + @tagName(target.os.tag), + std.zig.target.glibcAbiNameHeaders(target.abi), })); try args.append("-I"); diff --git a/src/libs/netbsd.zig b/src/libs/netbsd.zig index 1aba9da399..718861bf5c 100644 --- a/src/libs/netbsd.zig +++ b/src/libs/netbsd.zig @@ -100,7 +100,7 @@ pub fn buildCrtFile(comp: *Compilation, crt_file: CrtFile, prog_node: std.Progre try includePath(comp, arena, try std.fmt.allocPrint(arena, "{s}-{s}-{s}", .{ std.zig.target.netbsdArchNameHeaders(target.cpu.arch), @tagName(target.os.tag), - @tagName(target.abi), + std.zig.target.netbsdAbiNameHeaders(target.abi), })), "-I", try includePath(comp, arena, "generic-netbsd"), |