authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-05-05 09:07:46+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-05-05 09:07:52+02:00
log5cfd47660cc0422f92c5c2d029d6dbad3f213e52
tree7a7f68ffe0cef1489396745b7c128ca9b21b2229
parent0934823815f1d4336b2160f09f65df5ba8e52a15
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

0934823815f1d4336b2160f09f65df5ba8e52a15 take 2.

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

src/libcxx.zig+3-2
...@@ -383,11 +383,12 @@ pub fn buildLibCxxAbi(comp: *Compilation, prog_node: std.Progress.Node) BuildErr...@@ -383,11 +383,12 @@ pub fn buildLibCxxAbi(comp: *Compilation, prog_node: std.Progress.Node) BuildErr
383 const cxxabi_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxxabi", "include" });383 const cxxabi_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxxabi", "include" });
384 const cxx_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxx", "include" });384 const cxx_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxx", "include" });
385 const cxx_src_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxx", "src" });385 const cxx_src_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxx", "src" });
386 const abi_version: u2 = if (target.os.tag == .emscripten) 2 else 1;
386 const abi_version_arg = try std.fmt.allocPrint(arena, "-D_LIBCPP_ABI_VERSION={d}", .{387 const abi_version_arg = try std.fmt.allocPrint(arena, "-D_LIBCPP_ABI_VERSION={d}", .{
387 @intFromEnum(comp.libcxx_abi_version),388 abi_version,
388 });389 });
389 const abi_namespace_arg = try std.fmt.allocPrint(arena, "-D_LIBCPP_ABI_NAMESPACE=__{d}", .{390 const abi_namespace_arg = try std.fmt.allocPrint(arena, "-D_LIBCPP_ABI_NAMESPACE=__{d}", .{
390 @intFromEnum(comp.libcxx_abi_version),391 abi_version,
391 });392 });
392393
393 const optimize_mode = comp.compilerRtOptMode();394 const optimize_mode = comp.compilerRtOptMode();