CI: cross fuckery 2

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

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -95,7 +95,7 @@ jobs:
 
       - name: debugprint
         run: |
-          find / -name alsa.pc
+          find / -name alsa.pc 2> /dev/null || true
 
       - name: build
         uses: houseabsolute/actions-rust-cross@v0

diff --git a/Cross.toml b/Cross.toml
@@ -6,19 +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",
+    "export PKG_CONFIG_LIBDIR_aarch64_unknown_linux_gnu=/usr/lib/aarch64-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",
+    "export PKG_CONFIG_LIBDIR_x86_64_unknown_linux_musl=/usr/lib/x86_64-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",
+    "export PKG_CONFIG_LIBDIR_aarch64_unknown_linux_musl=/usr/lib/aarch64-linux-musl/pkgconfig",
     "apk add alsa-lib-dev"
 ]