From 5cfd47660cc0422f92c5c2d029d6dbad3f213e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Mon, 5 May 2025 09:07:46 +0200 Subject: [PATCH] 0934823815f1d4336b2160f09f65df5ba8e52a15 take 2. --- src/libcxx.zig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libcxx.zig b/src/libcxx.zig index 89f075038f..84b6183bcd 100644 --- a/src/libcxx.zig +++ b/src/libcxx.zig @@ -383,11 +383,12 @@ pub fn buildLibCxxAbi(comp: *Compilation, prog_node: std.Progress.Node) BuildErr const cxxabi_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxxabi", "include" }); const cxx_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxx", "include" }); const cxx_src_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxx", "src" }); + const abi_version: u2 = if (target.os.tag == .emscripten) 2 else 1; const abi_version_arg = try std.fmt.allocPrint(arena, "-D_LIBCPP_ABI_VERSION={d}", .{ - @intFromEnum(comp.libcxx_abi_version), + abi_version, }); const abi_namespace_arg = try std.fmt.allocPrint(arena, "-D_LIBCPP_ABI_NAMESPACE=__{d}", .{ - @intFromEnum(comp.libcxx_abi_version), + abi_version, }); const optimize_mode = comp.compilerRtOptMode();