diff options
| author | Alex Rønne Petersen <alex@alexrp.com> | 2025-10-04 00:44:21 +0200 |
|---|---|---|
| committer | Alex Rønne Petersen <alex@alexrp.com> | 2025-10-04 00:46:02 +0200 |
| commit | 43888e654998a118cde3c3ac4fb7004ffbe44323 (patch) | |
| tree | 6de8bcbae664b8e9445f6b559e910ff36ed5205a /src | |
| parent | 920ea357148bff61922608664474873e65d4c5d9 (diff) | |
| download | zig-43888e654998a118cde3c3ac4fb7004ffbe44323.tar.gz zig-43888e654998a118cde3c3ac4fb7004ffbe44323.zip | |
libcxxabi: don't build cxa_noexception.cpp if exceptions are enabled
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/libcxx.zig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/libcxx.zig b/src/libs/libcxx.zig index 77c55b3920..6fc9817096 100644 --- a/src/libs/libcxx.zig +++ b/src/libs/libcxx.zig @@ -393,11 +393,13 @@ pub fn buildLibCxxAbi(comp: *Compilation, prog_node: std.Progress.Node) BuildErr var c_source_files = try std.array_list.Managed(Compilation.CSourceFile).initCapacity(arena, libcxxabi_files.len); for (libcxxabi_files) |cxxabi_src| { - if (!comp.config.any_non_single_threaded and std.mem.startsWith(u8, cxxabi_src, "src/cxa_thread_atexit.cpp")) + if (!comp.config.any_non_single_threaded and std.mem.eql(u8, cxxabi_src, "src/cxa_thread_atexit.cpp")) continue; if (target.os.tag == .wasi and (std.mem.eql(u8, cxxabi_src, "src/cxa_exception.cpp") or std.mem.eql(u8, cxxabi_src, "src/cxa_personality.cpp"))) continue; + if (target.os.tag != .wasi and std.mem.eql(u8, cxxabi_src, "src/cxa_noexception.cpp")) + continue; var cflags = std.array_list.Managed([]const u8).init(arena); |