Skip to content

fix for cross compiling without feature flag #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
calvinrp merged 1 commit into from
May 17, 2024
Merged

fix for cross compiling without feature flag #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/publish-binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
11 changes: 11 additions & 0 deletions Cross.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"