CI: cross fuckery

ahihi · Aug 2, 2024 · 0f952c3 · 0f952c3
1 parent 6e08857
commit 0f952c3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -86,12 +86,16 @@ jobs:
       #     packages: musl-tools musl-dev:${{ matrix.target-apt-arch }}
       #     version: 1.0
 
-      # - name: cache apt packages
-      #   if: startsWith(matrix.os, 'ubuntu')
-      #   uses: awalsh128/cache-apt-pkgs-action@latest
-      #   with:
-      #     packages: libasound2-dev
-      #     version: 1.0
+      - name: cache apt packages
+        if: startsWith(matrix.os, 'ubuntu')
+        uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: libasound2-dev
+          version: 1.0
+
+      - name: debugprint
+        run: |
+          find / -name alsa.pc
 
       - name: build
         uses: houseabsolute/actions-rust-cross@v0

diff --git a/Cross.toml b/Cross.toml
@@ -6,16 +6,19 @@ pre-build = [
 
 [target.aarch64-unknown-linux-gnu]
 pre-build = [
+    "export PKG_CONFIG_LIBDIR_aarch64_unknown_linux_gnu=/usr/lib/aarch64-unknown-linux-gnu/pkgconfig",
     "dpkg --add-architecture $CROSS_DEB_ARCH",
     "apt-get update && apt-get install --assume-yes libasound2-dev:$CROSS_DEB_ARCH"
 ]
 
 [target.x86_64-unknown-linux-musl]
 pre-build = [
+    "export PKG_CONFIG_LIBDIR_x86_64_unknown_linux_musl=/usr/lib/x86_64-unknown-linux-musl/pkgconfig",
     "apk add alsa-lib-dev"
 ]
 
 [target.aarch64-unknown-linux-musl]
 pre-build = [
+    "export PKG_CONFIG_LIBDIR_aarch64_unknown_linux_musl=/usr/lib/aarch64-unknown-linux-musl/pkgconfig",
     "apk add alsa-lib-dev"
 ]