From 4f3d6e98b36239bda50fe4e6ba77ecef8be0d7e0 Mon Sep 17 00:00:00 2001
From: Brian Smith <brian@briansmith.org>
Date: Sun, 18 Feb 2024 13:00:56 -0800
Subject: [PATCH] CI: Use LLVM/Clang 18.

Rust updated to LLVM 18. Use Clang 18 as the C compiler so that the
coverage info for C is compatible with that for Rust.
---
 .github/workflows/ci.yml  | 4 +---
 mk/cargo.sh               | 2 +-
 mk/install-build-tools.sh | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2d4b8b2c3d..c754429d99 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -530,10 +530,8 @@ jobs:
           - # debug
 
         # Coverage collection is Nightly-only
-        # XXX: Starting with nightly-2024-02-14 there is a segfault when
-        # running the tests.
         rust_channel:
-          - nightly-2024-02-13
+          - nightly
 
         # TODO: targets
         include:
diff --git a/mk/cargo.sh b/mk/cargo.sh
index 3c4a361b2f..ea9400c42f 100755
--- a/mk/cargo.sh
+++ b/mk/cargo.sh
@@ -54,7 +54,7 @@ for arg in $*; do
 done
 
 # See comments in install-build-tools.sh.
-llvm_version=16
+llvm_version=18
 
 case $target in
    aarch64-linux-android)
diff --git a/mk/install-build-tools.sh b/mk/install-build-tools.sh
index 8e7901f1ed..8fc5ab54b6 100755
--- a/mk/install-build-tools.sh
+++ b/mk/install-build-tools.sh
@@ -173,7 +173,7 @@ esac
 case "$OSTYPE" in
 linux*)
   ubuntu_codename=$(lsb_release --codename --short)
-  llvm_version=16
+  llvm_version=18
   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