Bump Rust-BPF to Rust 1.39 (#7420)

This commit is contained in:
Jack May
2019-12-10 22:27:14 -08:00
committed by GitHub
parent 8920ac02f6
commit 9e2ce1751b
3 changed files with 13 additions and 32 deletions

View File

@ -37,6 +37,7 @@ export RUSTFLAGS="
# Setup xargo
export XARGO_HOME="$bpf_sdk/dependencies/xargo"
export XARGO_RUST_SRC="$bpf_sdk/dependencies/rust-bpf-sysroot/src"
export RUST_COMPILER_RT_ROOT="$bpf_sdk/dependencies/rust-bpf-sysroot/src/compiler-rt"
cd "$1"
xargo build --target bpfel-unknown-unknown --release

View File

@ -79,7 +79,7 @@ if [[ ! -f llvm-native-$machine-$version.md ]]; then
fi
# Install Rust-BPF
version=v0.1.8
version=v0.2.0
if [[ ! -f rust-bpf-$machine-$version.md ]]; then
(
filename=solana-rust-bpf-$machine.tar.bz2
@ -115,7 +115,7 @@ if [[ ! -f rust-bpf-$machine-$version.md ]]; then
fi
# Install Rust-BPF Sysroot sources
version=v0.11
version=v0.12
if [[ ! -f rust-bpf-sysroot-$version.md ]]; then
(
set -ex
@ -133,23 +133,4 @@ if [[ ! -f rust-bpf-sysroot-$version.md ]]; then
fi
fi
# Install custom Hashbrown crate needed by Rust-BPF Sysroot
version=v0.1
if [[ ! -f hashbrown-$version.md ]]; then
(
set -ex
rm -rf hashbrown*
rm -rf xargo
cmd="git clone --recursive --single-branch --branch $version https://github.com/solana-labs/hashbrown.git"
$cmd
echo "$cmd" > hashbrown-$version.md
)
exitcode=$?
if [[ $exitcode -ne 0 ]]; then
rm -rf hashbrown
exit 1
fi
fi
exit 0