zig

commit 827fa4d837accc197df730f4a011c7c8a97202d1 (tree)
parent 86ebd4b975d2f1e01f468e06daab6e28c06f9719
Author: Takeshi Yoneda <takeshi@tetrate.io>
Date:   Mon, 14 Jun 2021 17:48:01 +0900

c++,wasi: enable libcxx build.

Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>

Diffstat:
M
src/libcxx.zig
 | 
12
+++++++-----

1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/libcxx.zig b/src/libcxx.zig
@@ -113,11 +113,13 @@ pub fn buildLibCXX(comp: *Compilation) !void {
     for (libcxx_files) |cxx_src| {
         var cflags = std.ArrayList([]const u8).init(arena);
 
-        if (target.os.tag == .windows) {
-            // Filesystem stuff isn't supported on Windows.
+        if (target.os.tag == .windows or target.os.tag == .wasi) {
+            // Filesystem stuff isn't supported on Windows and WASI.
             if (std.mem.startsWith(u8, cxx_src, "src/filesystem/"))
                 continue;
-        } else {
+        }
+
+        if (target.os.tag != .windows) {
             if (std.mem.startsWith(u8, cxx_src, "src/support/win32/"))
                 continue;
         }
@@ -133,7 +135,7 @@ pub fn buildLibCXX(comp: *Compilation) !void {
         try cflags.append("-fvisibility=hidden");
         try cflags.append("-fvisibility-inlines-hidden");
 
-        if (target.abi.isMusl()) {
+        if (target.abi.isMusl() or target.os.tag == .wasi) {
             try cflags.append("-D_LIBCPP_HAS_MUSL_LIBC");
         }
 
@@ -252,7 +254,7 @@ pub fn buildLibCXXABI(comp: *Compilation) !void {
         try cflags.append("-fvisibility=hidden");
         try cflags.append("-fvisibility-inlines-hidden");
 
-        if (target.abi.isMusl()) {
+        if (target.abi.isMusl() or target.os.tag == .wasi) {
             try cflags.append("-D_LIBCPP_HAS_MUSL_LIBC");
         }