From be5a7edd00ee190502291f35da98d6f4a0e537cb Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Wed, 21 Feb 2024 10:33:38 -0500
Subject: [PATCH] Release platform-tools v1.40

This is an upgrade to llvm 17.0 and rust 1.75.0.
---
 build.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index a86624a..2026175 100755
--- a/build.sh
+++ b/build.sh
@@ -34,10 +34,10 @@ rm -rf "${OUT_DIR}"
 mkdir -p "${OUT_DIR}"
 pushd "${OUT_DIR}"
 
-git clone --single-branch --branch solana-tools-v1.39 https://github.com/solana-labs/rust.git
+git clone --single-branch --branch solana-tools-v1.40 --recurse-submodules --shallow-submodules https://github.com/solana-labs/rust.git
 echo "$( cd rust && git rev-parse HEAD )  https://github.com/solana-labs/rust.git" >> version.md
 
-git clone --single-branch --branch solana-tools-v1.39 https://github.com/solana-labs/cargo.git
+git clone --single-branch --branch solana-tools-v1.40 https://github.com/solana-labs/cargo.git
 echo "$( cd cargo && git rev-parse HEAD )  https://github.com/solana-labs/cargo.git" >> version.md
 
 pushd rust
@@ -57,7 +57,7 @@ fi
 popd
 
 if [[ "${HOST_TRIPLE}" != "x86_64-pc-windows-msvc" ]] ; then
-    git clone --single-branch --branch solana-tools-v1.39 https://github.com/solana-labs/newlib.git
+    git clone --single-branch --branch solana-tools-v1.40 https://github.com/solana-labs/newlib.git
     echo "$( cd newlib && git rev-parse HEAD )  https://github.com/solana-labs/newlib.git" >> version.md
     mkdir -p newlib_build
     mkdir -p newlib_install
@@ -96,7 +96,7 @@ clang
 clang++
 clang-cl
 clang-cpp
-clang-16
+clang-17
 ld.lld
 ld64.lld
 llc
@@ -162,7 +162,7 @@ mkdir move-dev
 if [[ "${HOST_TRIPLE}" == "x86_64-pc-windows-msvc" ]] ; then
     rm -f rust/build/${HOST_TRIPLE}/llvm/bin/{llvm-ranlib.exe,llvm-lib.exe,llvm-dlltool.exe}
 fi
-cp -R "rust/build/${HOST_TRIPLE}/llvm/"{bin,include,lib} move-dev/
+mv "rust/build/${HOST_TRIPLE}/llvm/"{bin,include,lib} move-dev/
 tar -jcf "${MOVE_DEV_TAR}" move-dev
 
 popd