fix for cross compiling without feature flag (#295)

bytecodealliance · May 17, 2024 · 2d6e71d · 2d6e71d
1 parent d6f1a26
commit 2d6e71d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git 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/warg.exe ./target/${{ matrix.rust-target }}/release/warg-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/warg.exe ./target/${{ matrix.rust-target }}/release/warg-cli-${{ matrix.rust-target }}
         if: matrix.os == 'windows-latest'

diff --git a/Cross.toml 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"