From 84ca98f9e1bb10f2e754c5fb8e5cc9c58ac6c276 Mon Sep 17 00:00:00 2001
From: Aleksandr Nogikh <nogikh@google.com>
Date: Wed, 23 Apr 2025 19:16:57 +0200
Subject: pkg/vcs: use clang-15 for builds up to v6.15

Otherwise we need to backport too many fix commits to address build/boot
errors.
---
 pkg/vcs/linux.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkg/vcs/linux.go')

diff --git a/pkg/vcs/linux.go b/pkg/vcs/linux.go
index c0b96aaa4..e34fe9186 100644
--- a/pkg/vcs/linux.go
+++ b/pkg/vcs/linux.go
@@ -160,10 +160,12 @@ func (ctx *linux) EnvForCommit(
 
 func linuxClangPath(tags map[string]bool, binDir, defaultCompiler string) string {
 	version := ""
+	// The defaultCompiler and clang-15 are assumed to be available.
 	switch {
-	case tags["v5.9"]:
-		// Verified to work with 14.0.6.
+	case tags["v6.15"]:
 		return defaultCompiler
+	case tags["v5.9"]:
+		return "clang-15"
 	default:
 		// everything before v5.3 might not work great
 		// everything before v5.1 does not work
-- 
cgit mrf-deployment