diff options
| author | Alex Rønne Petersen <alex@alexrp.com> | 2025-06-04 05:14:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-04 05:14:21 +0200 |
| commit | 3b2bef8a95190cb93f8edb6425dddbf845c3ad79 (patch) | |
| tree | dc3bad477321bc47b93acc6d531cd3198c85d38a /src/libs | |
| parent | cd03a0a153aae3e0450b7878b67906fb41521d13 (diff) | |
| parent | 63a9048baf64fd30c5e6d2c753bd7e584194bf7a (diff) | |
| download | zig-3b2bef8a95190cb93f8edb6425dddbf845c3ad79.tar.gz zig-3b2bef8a95190cb93f8edb6425dddbf845c3ad79.zip | |
Merge pull request #24025 from alexrp/glibc-deduplication
`libc`: Merge header directories for glibc and NetBSD libc where applicable
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"), |