mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-09 15:19:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

compiler: Fix build break due to #23836 being merged before #23913.

Browse source
This commit is contained in:
Alex Rønne Petersen 2025-05-20 07:59:16 +02:00
parent 999777e73a
commit a63f7875f4
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/libs/netbsd.zig
View file

@ -34,7 +34,7 @@ pub fn needsCrt0(output_mode: std.builtin.OutputMode) ?CrtFile {
fn includePath(comp: *Compilation, arena: Allocator, sub_path: []const u8) ![]const u8 { fn includePath(comp: *Compilation, arena: Allocator, sub_path: []const u8) ![]const u8 {
return path.join(arena, &.{ return path.join(arena, &.{
comp.zig_lib_directory.path.?, comp.dirs.zig_lib.path.?,
"libc" ++ path.sep_str ++ "include", "libc" ++ path.sep_str ++ "include",
sub_path, sub_path,
}); });
@ -42,7 +42,7 @@ fn includePath(comp: *Compilation, arena: Allocator, sub_path: []const u8) ![]co
fn csuPath(comp: *Compilation, arena: Allocator, sub_path: []const u8) ![]const u8 { fn csuPath(comp: *Compilation, arena: Allocator, sub_path: []const u8) ![]const u8 {
return path.join(arena, &.{ return path.join(arena, &.{
comp.zig_lib_directory.path.?, comp.dirs.zig_lib.path.?,
"libc" ++ path.sep_str ++ "netbsd" ++ path.sep_str ++ "lib" ++ path.sep_str ++ "csu", "libc" ++ path.sep_str ++ "netbsd" ++ path.sep_str ++ "lib" ++ path.sep_str ++ "csu",
sub_path, sub_path,
}); });
@ -383,11 +383,11 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye
// Use the global cache directory. // Use the global cache directory.
var cache: Cache = .{ var cache: Cache = .{
.gpa = gpa, .gpa = gpa,
.manifest_dir = try comp.global_cache_directory.handle.makeOpenPath("h", .{}), .manifest_dir = try comp.dirs.global_cache.handle.makeOpenPath("h", .{}),
}; };
cache.addPrefix(.{ .path = null, .handle = fs.cwd() }); cache.addPrefix(.{ .path = null, .handle = fs.cwd() });
cache.addPrefix(comp.zig_lib_directory); cache.addPrefix(comp.dirs.zig_lib);
cache.addPrefix(comp.global_cache_directory); cache.addPrefix(comp.dirs.global_cache);
defer cache.manifest_dir.close(); defer cache.manifest_dir.close();
var man = cache.obtain(); var man = cache.obtain();
@ -397,7 +397,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye
man.hash.add(target.abi); man.hash.add(target.abi);
man.hash.add(target_version); man.hash.add(target_version);
const full_abilists_path = try comp.zig_lib_directory.join(arena, &.{abilists_path}); const full_abilists_path = try comp.dirs.zig_lib.join(arena, &.{abilists_path});
const abilists_index = try man.addFile(full_abilists_path, abilists_max_size); const abilists_index = try man.addFile(full_abilists_path, abilists_max_size);
if (try man.hit()) { if (try man.hit()) {
@ -406,7 +406,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye
return queueSharedObjects(comp, .{ return queueSharedObjects(comp, .{
.lock = man.toOwnedLock(), .lock = man.toOwnedLock(),
.dir_path = .{ .dir_path = .{
.root_dir = comp.global_cache_directory, .root_dir = comp.dirs.global_cache,
.sub_path = try gpa.dupe(u8, "o" ++ fs.path.sep_str ++ digest), .sub_path = try gpa.dupe(u8, "o" ++ fs.path.sep_str ++ digest),
}, },
}); });
@ -415,9 +415,9 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye
const digest = man.final(); const digest = man.final();
const o_sub_path = try path.join(arena, &[_][]const u8{ "o", &digest }); const o_sub_path = try path.join(arena, &[_][]const u8{ "o", &digest });
var o_directory: Compilation.Directory = .{ var o_directory: Cache.Directory = .{
.handle = try comp.global_cache_directory.handle.makeOpenPath(o_sub_path, .{}), .handle = try comp.dirs.global_cache.handle.makeOpenPath(o_sub_path, .{}),
.path = try comp.global_cache_directory.join(arena, &.{o_sub_path}), .path = try comp.dirs.global_cache.join(arena, &.{o_sub_path}),
}; };
defer o_directory.handle.close(); defer o_directory.handle.close();
@ -626,7 +626,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye
var lib_name_buf: [32]u8 = undefined; // Larger than each of the names "c", "pthread", etc. var lib_name_buf: [32]u8 = undefined; // Larger than each of the names "c", "pthread", etc.
const asm_file_basename = std.fmt.bufPrint(&lib_name_buf, "{s}.s", .{lib.name}) catch unreachable; const asm_file_basename = std.fmt.bufPrint(&lib_name_buf, "{s}.s", .{lib.name}) catch unreachable;
try o_directory.handle.writeFile(.{ .sub_path = asm_file_basename, .data = stubs_asm.items }); try o_directory.handle.writeFile(.{ .sub_path = asm_file_basename, .data = stubs_asm.items });
try buildSharedLib(comp, arena, comp.global_cache_directory, o_directory, asm_file_basename, lib, prog_node); try buildSharedLib(comp, arena, o_directory, asm_file_basename, lib, prog_node);
} }
man.writeManifest() catch |err| { man.writeManifest() catch |err| {
@ -636,7 +636,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye
return queueSharedObjects(comp, .{ return queueSharedObjects(comp, .{
.lock = man.toOwnedLock(), .lock = man.toOwnedLock(),
.dir_path = .{ .dir_path = .{
.root_dir = comp.global_cache_directory, .root_dir = comp.dirs.global_cache,
.sub_path = try gpa.dupe(u8, "o" ++ fs.path.sep_str ++ digest), .sub_path = try gpa.dupe(u8, "o" ++ fs.path.sep_str ++ digest),
}, },
}); });
@ -675,8 +675,7 @@ fn queueSharedObjects(comp: *Compilation, so_files: BuiltSharedObjects) void {
fn buildSharedLib( fn buildSharedLib(
comp: *Compilation, comp: *Compilation,
arena: Allocator, arena: Allocator,
zig_cache_directory: Compilation.Directory, bin_directory: Cache.Directory,
bin_directory: Compilation.Directory,
asm_file_basename: []const u8, asm_file_basename: []const u8,
lib: Lib, lib: Lib,
prog_node: std.Progress.Node, prog_node: std.Progress.Node,
@ -708,9 +707,8 @@ fn buildSharedLib(
}); });
const root_mod = try Module.create(arena, .{ const root_mod = try Module.create(arena, .{
.global_cache_directory = comp.global_cache_directory,
.paths = .{ .paths = .{
.root = .{ .root_dir = comp.zig_lib_directory }, .root = .zig_lib_root,
.root_src_path = "", .root_src_path = "",
}, },
.fully_qualified_name = "root", .fully_qualified_name = "root",
@ -730,8 +728,6 @@ fn buildSharedLib(
.global = config, .global = config,
.cc_argv = &.{}, .cc_argv = &.{},
.parent = null, .parent = null,
.builtin_mod = null,
.builtin_modules = null, // there is only one module in this compilation
}); });
const c_source_files = [1]Compilation.CSourceFile{ const c_source_files = [1]Compilation.CSourceFile{
@ -742,9 +738,7 @@ fn buildSharedLib(
}; };
const sub_compilation = try Compilation.create(comp.gpa, arena, .{ const sub_compilation = try Compilation.create(comp.gpa, arena, .{
.local_cache_directory = zig_cache_directory, .dirs = comp.dirs.withoutLocalCache(),
.global_cache_directory = comp.global_cache_directory,
.zig_lib_directory = comp.zig_lib_directory,
.thread_pool = comp.thread_pool, .thread_pool = comp.thread_pool,
.self_exe_path = comp.self_exe_path, .self_exe_path = comp.self_exe_path,
.cache_mode = .incremental, .cache_mode = .incremental,