Workflow and Zig Fixes

Shabinder · Aug 13, 2024 · fb961b3 · fb961b3
1 parent 0d1c8fa
commit fb961b3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -37,6 +37,9 @@ jobs:
 
       - name: Build native libraries
         run: |
+          if [[ "$(uname)" == "Darwin" ]]; then
+            ln -s /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/libSystem.B.tbd /opt/homebrew/Cellar/zig/0.13.0/lib/zig/libc/darwin/libSystem.tbd
+          fi
           cd zipline
           zig build
 
@@ -97,6 +100,9 @@ jobs:
 
       - name: Build native libraries
         run: |
+          if [[ "$(uname)" == "Darwin" ]]; then
+            ln -s /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/libSystem.B.tbd /opt/homebrew/Cellar/zig/0.13.0/lib/zig/libc/darwin/libSystem.tbd
+          fi
           cd zipline
           zig build
 

diff --git a/zipline/build.zig b/zipline/build.zig
@@ -133,7 +133,7 @@ fn getOutputDir(target: std.Target.Query, allocator: std.mem.Allocator) ![]const
 }
 
 fn listFilesWithExtension(ext: []const u8, allocator: std.mem.Allocator, dir_path: []const u8, recursive: bool) ![]const []const u8 {
-    var dir = try std.fs.cwd().openDir(dir_path, .{});
+    var dir = try std.fs.cwd().openDir(dir_path, .{ .iterate = true });
     defer dir.close();
 
     var files = std.ArrayList([]const u8).init(allocator);

diff --git a/zipline/src/androidMain/CMakeLists.txt b/zipline/src/androidMain/CMakeLists.txt
@@ -4,6 +4,10 @@ set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 11)
 
 file(GLOB_RECURSE sources "../../native/*.c" "../../native/*.cpp")
+file(GLOB_RECURSE pthread_sources "../../native/winpthreads/*.c")
+
+# Remove pthread sources from main sources list.
+list(REMOVE_ITEM sources ${pthread_sources})
 
 add_library(quickjs SHARED ${sources})