authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-09-28 08:00:56+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-09-28 14:45:31+02:00
logf90510b081e06449ab0bd97a1254c78f5be6a8d4
treecec6e31172a19c38144dba3e52c7084108d53583
parent1b0bde0d8dedfef324ba16fba5aa3a24b5fb9bbd

libcxx: respond to some feature macro changes in LLVM 20

https://github.com/llvm/llvm-project/commit/ba87515fea90b5d55836a8e3be63a7e683ce299d closes #25376

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

src/libs/libcxx.zig+8-8
......@@ -509,19 +509,19 @@ pub fn addCxxArgs(
509509 try cflags.append(try std.fmt.allocPrint(arena, "-D_LIBCPP_ABI_NAMESPACE=__{d}", .{
510510 abi_version,
511511 }));
512 try cflags.append(try std.fmt.allocPrint(arena, "-D_LIBCPP_HAS_{s}THREADS", .{
513 if (!comp.config.any_non_single_threaded) "NO_" else "",
512 try cflags.append(try std.fmt.allocPrint(arena, "-D_LIBCPP_HAS_THREADS={d}", .{
513 @as(u1, if (comp.config.any_non_single_threaded) 1 else 0),
514514 }));
515515 try cflags.append("-D_LIBCPP_HAS_MONOTONIC_CLOCK");
516516 try cflags.append("-D_LIBCPP_HAS_TERMINAL");
517 try cflags.append(try std.fmt.allocPrint(arena, "-D_LIBCPP_HAS_{s}MUSL_LIBC", .{
518 if (!target.abi.isMusl()) "NO_" else "",
517 try cflags.append(try std.fmt.allocPrint(arena, "-D_LIBCPP_HAS_MUSL_LIBC={d}", .{
518 @as(u1, if (target.abi.isMusl()) 1 else 0),
519519 }));
520520 try cflags.append("-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS");
521521 try cflags.append("-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS");
522 try cflags.append("-D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS");
523 try cflags.append(try std.fmt.allocPrint(arena, "-D_LIBCPP_HAS_{s}FILESYSTEM", .{
524 if (target.os.tag == .wasi) "NO_" else "",
522 try cflags.append("-D_LIBCPP_HAS_VENDOR_AVAILABILITY_ANNOTATIONS=0");
523 try cflags.append(try std.fmt.allocPrint(arena, "-D_LIBCPP_HAS_FILESYSTEM={d}", .{
524 @as(u1, if (target.os.tag == .wasi) 0 else 1),
525525 }));
526526 try cflags.append("-D_LIBCPP_HAS_RANDOM_DEVICE");
527527 try cflags.append("-D_LIBCPP_HAS_LOCALIZATION");
......@@ -545,7 +545,7 @@ pub fn addCxxArgs(
545545 if (target.isGnuLibC()) {
546546 // glibc 2.16 introduced aligned_alloc
547547 if (target.os.versionRange().gnuLibCVersion().?.order(.{ .major = 2, .minor = 16, .patch = 0 }) == .lt) {
548 try cflags.append("-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION");
548 try cflags.append("-D_LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION=0");
549549 }
550550 }
551551 try cflags.append("-D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS");