authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-10-04 00:44:21+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-10-06 23:28:58+02:00
logbc7cdc2b6b08070e1983d6c38744d74c9dddf5da
tree91f68cd95e4a63a3b92f57ff962a61d91c16b6a2
parent03078bfa414577188c904f83439ab136d3d86361
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

libcxxabi: don't build cxa_noexception.cpp if exceptions are enabled

1 files changed, 3 insertions(+), 1 deletions(-)

src/libs/libcxx.zig+3-1
...@@ -393,11 +393,13 @@ pub fn buildLibCxxAbi(comp: *Compilation, prog_node: std.Progress.Node) BuildErr...@@ -393,11 +393,13 @@ pub fn buildLibCxxAbi(comp: *Compilation, prog_node: std.Progress.Node) BuildErr
393 var c_source_files = try std.array_list.Managed(Compilation.CSourceFile).initCapacity(arena, libcxxabi_files.len);393 var c_source_files = try std.array_list.Managed(Compilation.CSourceFile).initCapacity(arena, libcxxabi_files.len);
394394
395 for (libcxxabi_files) |cxxabi_src| {395 for (libcxxabi_files) |cxxabi_src| {
396 if (!comp.config.any_non_single_threaded and std.mem.startsWith(u8, cxxabi_src, "src/cxa_thread_atexit.cpp"))396 if (!comp.config.any_non_single_threaded and std.mem.eql(u8, cxxabi_src, "src/cxa_thread_atexit.cpp"))
397 continue;397 continue;
398 if (target.os.tag == .wasi and398 if (target.os.tag == .wasi and
399 (std.mem.eql(u8, cxxabi_src, "src/cxa_exception.cpp") or std.mem.eql(u8, cxxabi_src, "src/cxa_personality.cpp")))399 (std.mem.eql(u8, cxxabi_src, "src/cxa_exception.cpp") or std.mem.eql(u8, cxxabi_src, "src/cxa_personality.cpp")))
400 continue;400 continue;
401 if (target.os.tag != .wasi and std.mem.eql(u8, cxxabi_src, "src/cxa_noexception.cpp"))
402 continue;
401403
402 var cflags = std.array_list.Managed([]const u8).init(arena);404 var cflags = std.array_list.Managed([]const u8).init(arena);
403405