Force unset CARGO to use correct version of cargo (#13027)

2020-10-20 23:50:34 +02:00 · 2020-10-20 23:50:34 +02:00 · 81d0c8ae7f
parent 83c53ae4b5
commit 81d0c8ae7f
1 changed files with 4 additions and 0 deletions
--- a/sdk/bpf/rust/build.sh
+++ b/sdk/bpf/rust/build.sh
@ -34,6 +34,10 @@ export RUSTFLAGS="
    -C link-arg=-no-threads \
    -C linker=$bpf_sdk/dependencies/llvm-native/bin/ld.lld"

+# CARGO may be set if build.sh is run from within cargo, causing
+# incompatibilities between cargo and xargo versions
+unset CARGO
+
 # Setup xargo
 export XARGO_HOME="$bpf_sdk/dependencies/xargo"
 export XARGO_RUST_SRC="$bpf_sdk/dependencies/rust-bpf-sysroot/src"