From 201a6639cae537030cede8c9ee6584a467f14e54 Mon Sep 17 00:00:00 2001
From: Gold856 <117957790+Gold856@users.noreply.github.com>
Date: Tue, 27 Jan 2026 01:09:36 -0500
Subject: [PATCH] Require cross compiler toolchain

---
 .github/workflows/build.yml | 4 ++--
 shared/config.gradle        | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1f475a2060..4d207630ea 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -268,10 +268,10 @@ jobs:
           - container: wpilib/roborio-cross-ubuntu:2025-24.04
             artifact-name: Athena
             build-options: "-Ponlylinuxathena"
-          - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
+          - container: wpilib/raspbian-cross-ubuntu:bookworm-22.04
             artifact-name: Raspbian
             build-options: "-Ponlylinuxarm32"
-          - container: wpilib/aarch64-cross-ubuntu:bullseye-22.04
+          - container: wpilib/aarch64-cross-ubuntu:bookworm-22.04
             artifact-name: Aarch64
             build-options: "-Ponlylinuxarm64"
 
diff --git a/shared/config.gradle b/shared/config.gradle
index 07c01bd490..77768f88ab 100644
--- a/shared/config.gradle
+++ b/shared/config.gradle
@@ -13,6 +13,11 @@ nativeUtils.wpi.configureDependencies {
     niLibVersion = "2026.1.0"
 }
 
+// Force cross compiles to fail without the toolchain
+if (wpilibTools.platformMapper.wpilibClassifier.contains('linux') && !wpilibTools.platformMapper.wpilibClassifier.contains('linux86-64')) {
+    nativeUtils.crossCompilers.getByName(wpilibTools.platformMapper.wpilibClassifier).optional = false
+}
+
 // Configure warnings and errors
 nativeUtils.wpi.addWarnings()
 nativeUtils.wpi.addWarningsAsErrors()