diff options
| author | Jacob Young <jacobly0@users.noreply.github.com> | 2025-06-04 01:42:40 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2025-06-06 23:42:14 -0700 |
| commit | 5986bdf868a58cdef2adf58ff27b6526eafd99fe (patch) | |
| tree | 5310161f00ef5adaa1baf62bac4d4ba646f26ab2 /src/Compilation.zig | |
| parent | e96d86064eb81977f254fa8f36481b7d150cb3b6 (diff) | |
| download | zig-5986bdf868a58cdef2adf58ff27b6526eafd99fe.tar.gz zig-5986bdf868a58cdef2adf58ff27b6526eafd99fe.zip | |
Compilation: enable the x86_64 backend by default for debug builds
Closes #22257
Diffstat (limited to 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index ba599d0207..13c1e50d9e 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -7225,7 +7225,7 @@ fn buildOutputFromZig( assert(out.* == null); out.* = crt_file; - comp.queueLinkTaskMode(crt_file.full_object_path, output_mode); + comp.queueLinkTaskMode(crt_file.full_object_path, &config); } pub const CrtFileOptions = struct { @@ -7349,7 +7349,7 @@ pub fn build_crt_file( try comp.updateSubCompilation(sub_compilation, misc_task_tag, prog_node); const crt_file = try sub_compilation.toCrtFile(); - comp.queueLinkTaskMode(crt_file.full_object_path, output_mode); + comp.queueLinkTaskMode(crt_file.full_object_path, &config); { comp.mutex.lock(); @@ -7359,11 +7359,14 @@ pub fn build_crt_file( } } -pub fn queueLinkTaskMode(comp: *Compilation, path: Cache.Path, output_mode: std.builtin.OutputMode) void { - comp.queueLinkTasks(switch (output_mode) { +pub fn queueLinkTaskMode(comp: *Compilation, path: Cache.Path, config: *const Compilation.Config) void { + comp.queueLinkTasks(switch (config.output_mode) { .Exe => unreachable, .Obj => &.{.{ .load_object = path }}, - .Lib => &.{.{ .load_archive = path }}, + .Lib => &.{switch (config.link_mode) { + .static => .{ .load_archive = path }, + .dynamic => .{ .load_dso = path }, + }}, }); } |
