From 4789a13a6ead00bc7938e9df36f05746675efda9 Mon Sep 17 00:00:00 2001
From: Jack May <jack@solana.com>
Date: Tue, 2 Mar 2021 00:45:28 -0800
Subject: [PATCH] configure rust-bpf toolchain for each tree (#15620)

---
 sdk/bpf/scripts/install.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index 593815076..61b3d075c 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -142,13 +142,6 @@ if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
            solana-bpf-tools-$machine.tar.bz2 \
            bpf-tools"
     get $version bpf-tools "$job"
-
-    set -ex
-    ./bpf-tools/rust/bin/rustc --print sysroot
-    set +e
-    rustup toolchain uninstall bpf
-    set -e
-    rustup toolchain link bpf bpf-tools/rust
   )
   exitcode=$?
   if [[ $exitcode -ne 0 ]]; then
@@ -156,6 +149,12 @@ if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
   fi
   touch bpf-tools-$version.md
 fi
+set -ex
+./bpf-tools/rust/bin/rustc --print sysroot
+set +e
+rustup toolchain uninstall bpf
+set -e
+rustup toolchain link bpf bpf-tools/rust
 
 # Install Rust-BPF Sysroot sources
 version=v1.0