From f8360fe853841c69c74310f85ba011d52983a889 Mon Sep 17 00:00:00 2001 From: Daniel Karzel Date: Mon, 15 Mar 2021 13:42:21 +1100 Subject: [PATCH] .cargo/config.toml for specifying linker To avoid code duplication we specify the linker for the specific target armv7-unknown-linux-gnueabihf in the config.toml file as specified here: https://doc.rust-lang.org/cargo/reference/config.html#targettriplelinker --- .cargo/config.toml | 2 ++ .github/workflows/ci.yml | 4 ---- .github/workflows/release-cli.yml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 00000000..0c1c209f --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,2 @@ +[target.armv7-unknown-linux-gnueabihf] +linker = "arm-linux-gnueabihf-gcc" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d99e849e..85b798f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,8 +64,6 @@ jobs: sudo apt-get install gcc-arm-linux-gnueabihf - name: Build binary - env: - CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc run: | cargo build -p swap --target ${{ matrix.target }} @@ -100,8 +98,6 @@ jobs: - uses: Swatinem/rust-cache@v1.2.0 - name: Build tests - env: - CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc run: cargo build --tests --workspace --all-features - name: Run monero-harness tests diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index 0501e090..5d349586 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -55,8 +55,7 @@ jobs: sudo apt-get install gcc-arm-linux-gnueabihf - name: Build ${{ matrix.target }} ${{ matrix.bin }} release binary - env: - CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc + run: cargo build --target=${{ matrix.target }} --release --package swap --bin ${{ matrix.bin }} - name: Smoke test the binary