diff --git a/src/main.zig b/src/main.zig index 0d239f1f99..b946447cc6 100644 --- a/src/main.zig +++ b/src/main.zig @@ -3832,7 +3832,7 @@ fn createModule( create_module.opts.link_libcpp = true; continue; } - switch (target_util.classifyCompilerRtLibName(target, lib_name)) { + switch (target_util.classifyCompilerRtLibName(lib_name)) { .none => {}, .only_libunwind, .both => { create_module.opts.link_libunwind = true; diff --git a/src/target.zig b/src/target.zig index ae3a8e7ecc..56069c26b2 100644 --- a/src/target.zig +++ b/src/target.zig @@ -260,8 +260,8 @@ pub fn supportsReturnAddress(target: std.Target) bool { pub const CompilerRtClassification = enum { none, only_compiler_rt, only_libunwind, both }; -pub fn classifyCompilerRtLibName(target: std.Target, name: []const u8) CompilerRtClassification { - if (target.abi.isGnu() and std.mem.eql(u8, name, "gcc_s")) { +pub fn classifyCompilerRtLibName(name: []const u8) CompilerRtClassification { + if (std.mem.eql(u8, name, "gcc_s")) { // libgcc_s includes exception handling functions, so if linking this library // is requested, zig needs to instead link libunwind. Otherwise we end up with // the linker unable to find `_Unwind_RaiseException` and other related symbols.