From 3f9cbf5cf4b6ada5f893f9e870d537b4d6905d67 Mon Sep 17 00:00:00 2001
From: Brian Smith <brian@briansmith.org>
Date: Sun, 3 Sep 2023 14:04:59 -0700
Subject: [PATCH] CI: Use LLVM 16 tools.

Rust now uses LLVM 16 and writes object files that LLVM 15's `nm` cannot
fully understand.
---
 mk/cargo.sh                 | 2 +-
 mk/check-symbol-prefixes.sh | 2 +-
 mk/install-build-tools.sh   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk/cargo.sh b/mk/cargo.sh
index 7ddb5dd628..d990220279 100755
--- a/mk/cargo.sh
+++ b/mk/cargo.sh
@@ -45,7 +45,7 @@ for arg in $*; do
 done
 
 # See comments in install-build-tools.sh.
-llvm_version=15
+llvm_version=16
 
 case $target in
    aarch64-linux-android)
diff --git a/mk/check-symbol-prefixes.sh b/mk/check-symbol-prefixes.sh
index 7d008678eb..83e721b2f4 100755
--- a/mk/check-symbol-prefixes.sh
+++ b/mk/check-symbol-prefixes.sh
@@ -22,7 +22,7 @@ darwin*)
   nm_exe=nm
   ;;
 *)
-  llvm_version=15
+  llvm_version=16
   nm_exe=llvm-nm-$llvm_version
   ;;
 esac
diff --git a/mk/install-build-tools.sh b/mk/install-build-tools.sh
index 77b01cdcb8..234516f032 100755
--- a/mk/install-build-tools.sh
+++ b/mk/install-build-tools.sh
@@ -102,7 +102,7 @@ esac
 case "$OSTYPE" in
 linux*)
   ubuntu_codename=$(lsb_release --codename --short)
-  llvm_version=15
+  llvm_version=16
   sudo apt-key add mk/llvm-snapshot.gpg.key
   sudo add-apt-repository "deb http://apt.llvm.org/$ubuntu_codename/ llvm-toolchain-$ubuntu_codename-$llvm_version main"
   sudo apt-get update