From a338eaccc8c3d20a476cb763afebeb7bb1b1a94a Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 1 Sep 2021 15:34:39 -0700 Subject: [PATCH] stage2: libcxx: logic for skipping OS-specific files --- src/libcxx.zig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libcxx.zig b/src/libcxx.zig index 2c0e381e0f..bd7da15fc1 100644 --- a/src/libcxx.zig +++ b/src/libcxx.zig @@ -121,10 +121,12 @@ pub fn buildLibCXX(comp: *Compilation) !void { continue; } - if (target.os.tag != .windows) { - if (std.mem.startsWith(u8, cxx_src, "src/support/win32/")) - continue; - } + if (std.mem.startsWith(u8, cxx_src, "src/support/win32/") and target.os.tag != .windows) + continue; + if (std.mem.startsWith(u8, cxx_src, "src/support/solaris/") and target.os.tag != .solaris) + continue; + if (std.mem.startsWith(u8, cxx_src, "src/support/ibm/") and target.os.tag != .zos) + continue; try cflags.append("-DNDEBUG"); try cflags.append("-D_LIBCPP_BUILDING_LIBRARY");