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

(cherry picked from commit 81d0c8ae7f)

Co-authored-by: Jon Cinque <jon.cinque@gmail.com>
This commit is contained in:
mergify[bot]
2020-10-20 23:06:57 +00:00
committed by GitHub
parent d24abbdac9
commit 0fde9e893f

View File

@ -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"