use CROSS_DEB_ARCH define to simplify cross.build

tuna-f1sh · Nov 18, 2023 · 1a23a47 · 1a23a47
1 parent 1a83a15
commit 1a23a47
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          # - { os: ubuntu-latest, target: aarch64-unknown-linux-gnu, use-cross: true }
+          - { os: ubuntu-latest, target: aarch64-unknown-linux-gnu, use-cross: true }
           - { os: ubuntu-latest, target: x86_64-pc-windows-gnu, use-cross: true }
           - { os: ubuntu-latest, target: x86_64-unknown-linux-gnu, use-cross: false }
           - { os: macos-latest, target: universal-apple-darwin, use-cross: false }

diff --git a/Cargo.toml b/Cargo.toml
@@ -65,17 +65,8 @@ strip = true
 panic = "abort"
 codegen-units = 1 # quicker binary, slower build
 
-[package.metadata.cross.target.arm-unknown-linux-gnueabihf]
-pre-build = ["dpkg --add-architecture armhf && apt-get update && apt-get install --assume-yes libusb-1.0-0-dev:armhf libudev-dev:armhf"]
-
-[package.metadata.cross.target.aarch64-unknown-linux-gnu]
-pre-build = ["dpkg --add-architecture arm64 && apt-get update && apt-get install --assume-yes libusb-1.0-0-dev:arm64 libudev-dev:arm64"]
-
-[package.metadata.cross.target.i686-unknown-linux-gnu]
-pre-build = ["dpkg --add-architecture i386 && apt-get update && apt-get install --assume-yes libusb-1.0-0-dev:i386 libudev-dev:i386"]
-
-[package.metadata.cross.target.x86_64-unknown-linux-gnu]
-pre-build = ["apt-get update && apt-get install --assume-yes libusb-1.0-0-dev libudev-dev"]
+[package.metadata.cross.build]
+pre-build = ["dpkg --add-architecture $CROSS_DEB_ARCH && apt-get update && apt-get install --assume-yes libusb-1.0-0-dev:$CROSS_DEB_ARCH libudev-dev:$CROSS_DEB_ARCH"]
 
 [package.metadata.deb]
 section = "utility"