Still trying to fix crossplatform CI build.

Author: jmaczan

.github/workflows/build-wheels.yml

@@ -41,6 +41,7 @@ jobs:
           mkdir -p out/Release
           cmake -S . -B out/Release \
             -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_OSX_ARCHITECTURES=arm64 \
             -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/dawn-install \
             -DBUILD_SHARED_LIBS=OFF \
             -DDAWN_BUILD_MONOLITHIC_LIBRARY=SHARED \
@@ -86,6 +87,7 @@ jobs:
           cp -r dawn/include/webgpu dawn-install/include/ 2>/dev/null || true
           cp -r dawn/include/dawn dawn-install/include/ 2>/dev/null || true
           cp -r dawn/out/Release/gen/include/dawn dawn-install/include/ 2>/dev/null || true
+          cp -r dawn/out/Release/gen/include/webgpu dawn-install/include/ 2>/dev/null || true
 
       - name: Verify installation
         run: |
@@ -177,6 +179,7 @@ jobs:
           cp -r dawn/include/webgpu dawn-install/include/ 2>/dev/null || true
           cp -r dawn/include/dawn dawn-install/include/ 2>/dev/null || true
           cp -r dawn/out/Release/gen/include/dawn dawn-install/include/ 2>/dev/null || true
+          cp -r dawn/out/Release/gen/include/webgpu dawn-install/include/ 2>/dev/null || true
 
       - name: Verify installation
         run: |
@@ -238,6 +241,7 @@ jobs:
         run: |
           ls -la dawn-install/lib/
           test -f dawn-install/lib/webgpu_dawn.dll
+          test -f dawn-install/lib/webgpu_dawn.lib
 
       - name: Upload Dawn artifact
         uses: actions/upload-artifact@v4
@@ -277,6 +281,7 @@ jobs:
       - name: Build wheel
         env:
           DAWN_PREFIX: ${{ github.workspace }}/dawn-install
+          ARCHFLAGS: "-arch arm64"
         run: |
           pip wheel . --no-deps --no-build-isolation -w dist/
 

scripts/build-dawn.sh

@@ -87,9 +87,16 @@ if [ -z "$FOUND_LIB" ]; then
     fi
 fi
 
-# Windows: also copy .lib file if present
+# Windows: also copy .lib file if present (import library for linking)
+FOUND_IMPORT_LIB=""
 if [ -f "$BUILD_DIR/src/dawn/native/Release/webgpu_dawn.lib" ]; then
-    cp "$BUILD_DIR/src/dawn/native/Release/webgpu_dawn.lib" "$INSTALL_PREFIX/lib/"
+    FOUND_IMPORT_LIB="$BUILD_DIR/src/dawn/native/Release/webgpu_dawn.lib"
+    cp "$FOUND_IMPORT_LIB" "$INSTALL_PREFIX/lib/"
+else
+    FOUND_IMPORT_LIB=$(find "$BUILD_DIR" -name "webgpu_dawn.lib" 2>/dev/null | head -1 || true)
+    if [ -n "$FOUND_IMPORT_LIB" ]; then
+        cp "$FOUND_IMPORT_LIB" "$INSTALL_PREFIX/lib/"
+    fi
 fi
 
 if [ -z "$FOUND_LIB" ]; then
@@ -103,6 +110,7 @@ fi
 cp -r "$DAWN_DIR/include/webgpu" "$INSTALL_PREFIX/include/" 2>/dev/null || true
 cp -r "$DAWN_DIR/include/dawn" "$INSTALL_PREFIX/include/" 2>/dev/null || true
 cp -r "$BUILD_DIR/gen/include/dawn" "$INSTALL_PREFIX/include/" 2>/dev/null || true
+cp -r "$BUILD_DIR/gen/include/webgpu" "$INSTALL_PREFIX/include/" 2>/dev/null || true
 
 echo ""
 echo "Dawn built successfully!"