From cc7342a8ef719cbc1d44b37b8bcd8d6296e46598 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 20:00:23 +0800
Subject: [PATCH] Print the rust version when building bpf programs (#16181)
 (#16182)

(cherry picked from commit abada56ba1165025b57b73c3810100609222099b)

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

Co-authored-by: Justin Starry <justin@solana.com>
---
 sdk/bpf/scripts/install.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index 41c9e569da..82d56eeaee 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -192,7 +192,18 @@ if [[ ! -e rust-bpf-sysroot-$version.md || ! -e rust-bpf-sysroot ]]; then
   if [[ $exitcode -ne 0 ]]; then
     exit 1
   fi
+<<<<<<< HEAD
   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
 
 exit 0