Skip to content

Commit 9006aa8

Browse files
authored
Fix test_cross with cross 0.2.2 (#251)
* Fix `test_cross` with cross 0.2.2 * Try update `Cross.toml`
1 parent 3590d1a commit 9006aa8

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ jobs:
253253
toolchain: stable
254254
override: true
255255
- name: Install cross
256-
run: cargo install --version 0.2.1 cross
256+
run: cargo install cross
257257
- name: Build package
258258
run: pip install -e .
259259
- name: Build wheel using cross

examples/namespace_package/Cross.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
[target.aarch64-unknown-linux-gnu]
22
image = "cross-pyo3:aarch64-unknown-linux-gnu"
3-
4-
[build.env]
5-
passthrough = [
3+
env.passthrough = [
64
"RUST_BACKTRACE",
7-
"RUST_LOG",
8-
"PYO3_CROSS_LIB_DIR",
5+
"RUST_LOG",
6+
"PYO3_CROSS_LIB_DIR",
97
]

setuptools_rust/build.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,7 @@ def _prepare_build_environment(cross_lib: Optional[str]) -> Dict[str, str]:
695695
if cross_lib:
696696
env.setdefault("PYO3_CROSS_LIB_DIR", cross_lib)
697697

698+
env.pop("CARGO", None)
698699
return env
699700

700701

0 commit comments

Comments
 (0)