From d513e391123aef9dd9a4d7641305fd3fb04342bc Mon Sep 17 00:00:00 2001 From: Calvin Prewitt Date: Fri, 17 May 2024 13:14:46 -0500 Subject: [PATCH] fix for cross compiling without feature flag --- .github/workflows/publish-binaries.yml | 4 ++-- Cross.toml | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 Cross.toml diff --git a/.github/workflows/publish-binaries.yml b/.github/workflows/publish-binaries.yml index 67aec8e..6bae9e3 100644 --- a/.github/workflows/publish-binaries.yml +++ b/.github/workflows/publish-binaries.yml @@ -52,7 +52,7 @@ jobs: if: ${{ ! matrix.cross }} - run: cargo install cross if: ${{ matrix.cross }} - - run: cross build --release --target ${{ matrix.rust-target }} --features native-tls-vendored + - run: cross build --release --target ${{ matrix.rust-target }} if: ${{ matrix.cross }} - run: mv ./target/${{ matrix.rust-target }}/release/wac.exe ./target/${{ matrix.rust-target }}/release/wac-cli-${{ matrix.rust-target }} if: matrix.os == 'windows-latest' @@ -91,7 +91,7 @@ jobs: if: ${{ ! matrix.cross }} - run: cargo install cross if: ${{ matrix.cross }} - - run: cross build --release --target ${{ matrix.rust-target }} --features native-tls-vendored + - run: cross build --release --target ${{ matrix.rust-target }} if: ${{ matrix.cross }} - run: mv ./target/${{ matrix.rust-target }}/release/wac.exe ./target/${{ matrix.rust-target }}/release/wac-cli-${{ matrix.rust-target }} if: matrix.os == 'windows-latest' diff --git a/Cross.toml b/Cross.toml new file mode 100644 index 0000000..bd60868 --- /dev/null +++ b/Cross.toml @@ -0,0 +1,11 @@ +[target.aarch64-unknown-linux-gnu] +pre-build = [ + "dpkg --add-architecture $CROSS_DEB_ARCH", + "apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH", +] +env.passthrough = [ + "OPENSSL_LIB_DIR=/usr/lib/aarch64-linux-gnu", + "OPENSSL_INCLUDE_DIR=/usr/include/aarch64-linux-gnu/openssl", + "OPENSSL_STATIC=yes" +] +image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:edge"