Mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-04-27 19:09:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

zig cc: link compiler-rt when given -lcompiler_rt even with -nostdlib

Browse Source 
closes https://codeberg.org/ziglang/zig/issues/31460
This commit is contained in:
Alex Rønne Petersen
2026-03-12 13:43:00 +01:00
parent 26f2749c1e
commit ab1a4b26ec
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.zig
+19 -13
View File
@@ -871,6 +871,7 @@ fn buildOutputType(
var emit_h: Emit = .no;
var soname: SOName = undefined;
var want_compiler_rt: ?bool = null;
var zig_cc_explicitly_link_compiler_rt = false;
var want_ubsan_rt: ?bool = null;
var linker_script: ?[]const u8 = null;
var version_script: ?[]const u8 = null;
@@ -2000,8 +2001,8 @@ fn buildOutputType(
try create_module.cli_link_inputs.append(arena, .{ .dso_exact = .{
.name = it.only_arg,
} });
} else {
try create_module.cli_link_inputs.append(arena, .{ .name_query = .{
} else switch (target_util.classifyCompilerRtLibName(it.only_arg)) {
.none => try create_module.cli_link_inputs.append(arena, .{ .name_query = .{
.name = it.only_arg,
.query = .{
.must_link = must_link,
@@ -2011,7 +2012,21 @@ fn buildOutputType(
.search_strategy = lib_search_strategy,
.allow_so_scripts = allow_so_scripts,
},
} });
} }),
.only_compiler_rt => {
// We need this variable separately from `want_compiler_rt` because of
// invocations such as `zig cc -lcompiler_rt -nostdlib`. If we just set
// `want_compiler_rt = true` here, processing of the later `-nostdlib`
// would undo that.
zig_cc_explicitly_link_compiler_rt = true;
},
.only_libunwind => {
create_module.opts.link_libunwind = true;
},
.both => {
zig_cc_explicitly_link_compiler_rt = true;
create_module.opts.link_libunwind = true;
},
}
},
.ignore => {},
@@ -3547,7 +3562,7 @@ fn buildOutputType(
.framework_dirs = create_module.framework_dirs.items,
.frameworks = resolved_frameworks.items,
.windows_lib_names = create_module.windows_libs.keys(),
.want_compiler_rt = want_compiler_rt,
.want_compiler_rt = if (zig_cc_explicitly_link_compiler_rt) true else want_compiler_rt,
.want_ubsan_rt = want_ubsan_rt,
.hash_style = hash_style,
.linker_script = linker_script,
@@ -3979,15 +3994,6 @@ fn createModule(
continue;
}
switch (target_util.classifyCompilerRtLibName(lib_name)) {
.none => {},
.only_libunwind, .both => {
create_module.opts.link_libunwind = true;
continue;
},
.only_compiler_rt => continue,
}
if (target.isMinGW()) {
const exists = mingw.libExists(arena, io, target, create_module.dirs.zig_lib, lib_name) catch |err|
fatal("failed to check zig installation for DLL import libs: {t}", .{err});