From 2c317b2cbafe4f91fca66ee20f45197bbbd26353 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Mon, 29 Apr 2024 15:42:23 -0700
Subject: libcxx, libtsan, libunwind: fix error reporting

use a consistent error set to avoid failure when bootstrapping from zig1
---
 src/libtsan.zig | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/libtsan.zig')

diff --git a/src/libtsan.zig b/src/libtsan.zig
index 8f8ecce67d..a32c9ce297 100644
--- a/src/libtsan.zig
+++ b/src/libtsan.zig
@@ -305,13 +305,16 @@ pub fn buildTsan(comp: *Compilation, prog_node: *std.Progress.Node) BuildError!v
     };
     defer sub_compilation.destroy();
 
-    comp.updateSubCompilation(sub_compilation, .libtsan, prog_node) catch |err| {
-        comp.setMiscFailure(
-            .libtsan,
-            "unable to build thread sanitizer runtime: compilation failed: {s}",
-            .{@errorName(err)},
-        );
-        return error.SubCompilationFailed;
+    comp.updateSubCompilation(sub_compilation, .libtsan, prog_node) catch |err| switch (err) {
+        error.SubCompilationFailed => return error.SubCompilationFailed,
+        else => |e| {
+            comp.setMiscFailure(
+                .libtsan,
+                "unable to build thread sanitizer runtime: compilation failed: {s}",
+                .{@errorName(e)},
+            );
+            return error.SubCompilationFailed;
+        },
     };
 
     assert(comp.tsan_static_lib == null);
-- 
cgit v1.2.3