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

Print the rust version when building bpf programs (#16181) (#16182)

Browse Source 
(cherry picked from commit abada56ba1)

# Conflicts:
#	sdk/bpf/scripts/install.sh

Co-authored-by: Justin Starry <justin@solana.com>
This commit is contained in:
mergify[bot]
2021-03-29 20:00:23 +08:00
committed by GitHub
parent ffe2f96a58
commit cc7342a8ef
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,18 @@ if [[ ! -e rust-bpf-sysroot-$version.md || ! -e rust-bpf-sysroot ]]; then
if [[ $exitcode -ne 0 ]]; then if [[ $exitcode -ne 0 ]]; then
exit 1 exit 1
fi fi
<<<<<<< HEAD
touch rust-bpf-sysroot-$version.md touch rust-bpf-sysroot-$version.md
=======
touch bpf-tools-$version.md
set -ex
./bpf-tools/rust/bin/rustc --version
./bpf-tools/rust/bin/rustc --print sysroot
set +e
rustup toolchain uninstall bpf
set -e
rustup toolchain link bpf bpf-tools/rust
>>>>>>> abada56ba... Print the rust version when building bpf programs (#16181)
fi fi
exit 0 exit 0