From c0eb92d1888bf6084aaae5efc0436548c322dee5 Mon Sep 17 00:00:00 2001 From: Rahul Thakoor Date: Wed, 24 Apr 2024 15:12:01 +0400 Subject: [PATCH] Simplify Cross.toml file We currently define the pre-build commands to run individually for each target. All the commands are same, and we do not run target specific commands. This commit defines the pre-build commands using the [build config](https://github.com/cross-rs/cross/wiki/Configuration#build) Signed-off-by: Rahul Thakoor --- Cross.toml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/Cross.toml b/Cross.toml index 86e819c7..1671fe25 100644 --- a/Cross.toml +++ b/Cross.toml @@ -1,23 +1,5 @@ -[target.aarch64-unknown-linux-gnu] +[build] pre-build = [ "dpkg --add-architecture $CROSS_DEB_ARCH", "apt-get update && apt-get install --assume-yes libdbus-1-dev:$CROSS_DEB_ARCH" -] - -[target.armv7-unknown-linux-gnueabihf] -pre-build = [ - "dpkg --add-architecture $CROSS_DEB_ARCH", - "apt-get update && apt-get install --assume-yes libdbus-1-dev:$CROSS_DEB_ARCH" -] - -[target.x86_64-unknown-linux-gnu] -pre-build = [ - "dpkg --add-architecture $CROSS_DEB_ARCH", - "apt-get update && apt-get install --assume-yes libdbus-1-dev:$CROSS_DEB_ARCH" -] - -[target.i686-unknown-linux-gnu] -pre-build = [ - "dpkg --add-architecture $CROSS_DEB_ARCH", - "apt-get update && apt-get install --assume-yes libdbus-1-dev:$CROSS_DEB_ARCH" -] +] \ No newline at end of file