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

nasjuice · Oct 20, 2020 · 81d0c8a · 81d0c8a
1 parent 83c53ae
commit 81d0c8a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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"