gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Jack May
2021-03-02 01:00:26 -08:00
committed by Grimes
parent 9387ee6f3b
commit c22b83aa6c
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sdk/bpf/scripts/install.sh
View File

@ -159,22 +159,9 @@ if [[ ! -e rust-bpf-$machine-$version.md || ! -e rust-bpf-$machine ]]; then
job="download \ job="download \
https://github.com/solana-labs/rust-bpf-builder/releases/download \ https://github.com/solana-labs/rust-bpf-builder/releases/download \
$version \ $version \
<<<<<<< HEAD
solana-rust-bpf-$machine.tar.bz2 \ solana-rust-bpf-$machine.tar.bz2 \
rust-bpf-$machine" rust-bpf-$machine"
get $version rust-bpf-$machine "$job" get $version rust-bpf-$machine "$job"
set -ex
./rust-bpf-$machine/bin/rustc --print sysroot
set +e
rustup toolchain uninstall bpf
set -e
rustup toolchain link bpf rust-bpf-$machine
=======
solana-bpf-tools-$machine.tar.bz2 \
bpf-tools"
get $version bpf-tools "$job"
>>>>>>> 4789a13a6... configure rust-bpf toolchain for each tree (#15620)
) )
exitcode=$? exitcode=$?
if [[ $exitcode -ne 0 ]]; then if [[ $exitcode -ne 0 ]]; then
@ -183,11 +170,11 @@ if [[ ! -e rust-bpf-$machine-$version.md || ! -e rust-bpf-$machine ]]; then
touch rust-bpf-$machine-$version.md touch rust-bpf-$machine-$version.md
fi fi
set -ex set -ex
./bpf-tools/rust/bin/rustc --print sysroot ./rust-bpf-$machine/bin/rustc --print sysroot
set +e set +e
rustup toolchain uninstall bpf rustup toolchain uninstall bpf
set -e set -e
rustup toolchain link bpf bpf-tools/rust rustup toolchain link bpf rust-bpf-$machine
# Install Rust-BPF Sysroot sources # Install Rust-BPF Sysroot sources
version=v0.14 version=v0.14