diff --git a/src/main.zig b/src/main.zig index 3f38fd1f780dff11a56b7e1dcc1ffa62e35f8cfd..75655d6a2a6522d26e702cfe499efc140d99ed3e 100644 --- a/src/main.zig +++ b/src/main.zig @@ -2010,6 +2010,11 @@ fn buildOutputType( _ = system_libs.orderedRemove(lib_name); continue; } + if (target_util.is_compiler_rt_lib_name(target_info.target, lib_name)) { + std.log.warn("ignoring superfluous library '{s}': this dependency is fulfilled instead by compiler-rt which zig unconditionally provides", .{lib_name}); + _ = system_libs.orderedRemove(lib_name); + continue; + } if (std.fs.path.isAbsolute(lib_name)) { fatal("cannot use absolute path as a system library: {s}", .{lib_name}); } diff --git a/src/target.zig b/src/target.zig index 2c21fb5c6178f059d62f70ac4f3cee1e738778a4..63bd1db0b5ed5073c518fffba00fee6c3862def2 100644 --- a/src/target.zig +++ b/src/target.zig @@ -427,6 +427,16 @@ pub fn is_libcpp_lib_name(target: std.Target, name: []const u8) bool { eqlIgnoreCase(ignore_case, name, "c++abi"); } +pub fn is_compiler_rt_lib_name(target: std.Target, name: []const u8) bool { + if (target.abi.isGnu() and std.mem.eql(u8, name, "gcc_s")) { + return true; + } + if (std.mem.eql(u8, name, "compiler_rt")) { + return true; + } + return false; +} + pub fn hasDebugInfo(target: std.Target) bool { return !target.cpu.arch.isWasm(); }