Skip to content

Commit c03d398

Browse files
fix cross toml
1 parent e17ceac commit c03d398

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,15 +206,14 @@ jobs:
206206
exit 1
207207
fi
208208
209-
- name: Build with Kafka (cross) - DEBUG
210209
if: matrix.use_cross
211210
env:
212211
LIBRDKAFKA_SSL_VENDORED: "1"
213212
PKG_CONFIG_ALLOW_CROSS: "1"
214213
CROSS_NO_WARNINGS: "0"
215214
RUST_BACKTRACE: "1"
216215

217-
# Will be updated based on Cross.toml pre-build output
216+
# Standard Debian multiarch paths for aarch64
218217
ZLIB_INCLUDE_DIR: "/usr/include"
219218
ZLIB_LIBRARY: "/usr/lib/aarch64-linux-gnu/libz.so"
220219

@@ -223,12 +222,9 @@ jobs:
223222
OPENSSL_CRYPTO_LIBRARY: "/usr/lib/aarch64-linux-gnu/libcrypto.so"
224223
OPENSSL_SSL_LIBRARY: "/usr/lib/aarch64-linux-gnu/libssl.so"
225224

226-
PKG_CONFIG_PATH: "/usr/lib/aarch64-linux-gnu/pkgconfig"
225+
PKG_CONFIG_PATH: "/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig"
227226
run: |
228227
echo "=== HOST ENV DEBUG ==="
229228
env | grep -E 'ZLIB_|OPENSSL_|PKG_CONFIG|LIBRDKAFKA'
230-
echo "=== HOST PATHS DEBUG ==="
231-
ls -la /usr/include/aarch64-linux-gnu 2>/dev/null || echo "No host /usr/include/aarch64-linux-gnu"
232-
ls -la /usr/lib/aarch64-linux-gnu 2>/dev/null || echo "No host /usr/lib/aarch64-linux-gnu"
233-
echo "=== CROSS BUILD START ==="
229+
echo "=== NOW RUNNING CROSS BUILD (pre-build will show zlib paths) ==="
234230
cross build --target ${{ matrix.target }} --features kafka --release --verbose

Cross.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@ passthrough = [
2828
"OPENSSL_SSL_LIBRARY",
2929
"PKG_CONFIG_PATH",
3030
]
31-
# Fixed volumes syntax - mount host aarch64 paths into container
32-
volumes = [
33-
"ZLIB_HOST_INCLUDE=/usr/include/aarch64-linux-gnu",
34-
"ZLIB_HOST_LIB=/usr/lib/aarch64-linux-gnu",
35-
]
31+
# REMOVED: broken volumes causing cross to crash
3632

3733
[target.x86_64-unknown-linux-gnu]
3834
image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu@sha256:bf05360bb9d6d4947eed60532ac7a0d7e8fae8f214e9abb801d5941c8fe4918d"

0 commit comments

Comments
 (0)