From d3caabd98d205704f8577d6c28ee702be3d87975 Mon Sep 17 00:00:00 2001
From: Andrey G <dron0gus@gmail.com>
Date: Tue, 21 Dec 2021 00:17:53 +0300
Subject: [PATCH] Do compiler check first (#3706)

---
 firmware/Makefile        |  4 +++-
 firmware/check.c         | 24 ++++++++++++++++++++++++
 firmware/pch/pch.h       |  4 ----
 firmware/version_check.h | 15 ---------------
 4 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 firmware/check.c
 delete mode 100644 firmware/version_check.h

diff --git a/firmware/Makefile b/firmware/Makefile
index 9614c8b9d0..7fc9917f6e 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -223,7 +223,9 @@ $(info LDSCRIPT:      $(LDSCRIPT))
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC =  $(ALLCSRC) \
+# check.c goes first to throw error as soon as possible
+CSRC =  check.c \
+	$(ALLCSRC) \
 	$(CHIBIOS)/os/various/syscalls.c \
 	$(CHIBIOS_CONTRIB)/os/various/ramdisk.c \
 	$(CHIBIOS)/os/various/evtimer.c \
diff --git a/firmware/check.c b/firmware/check.c
new file mode 100644
index 0000000000..10ce4e0e7e
--- /dev/null
+++ b/firmware/check.c
@@ -0,0 +1,24 @@
+// This file asserts that the compiler is appropriate for rusEFI use.
+
+// non-MCU builds are significantly more tolerant
+#if EFI_PROD_CODE
+
+#define GCC_VERSION ((__GNUC__ * 100) + (__GNUC_MINOR__ * 10) + ( __GNUC_PATCHLEVEL__ ))
+
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
+
+// Firmware builds require at least GCC 9.3.1
+#if (GCC_VERSION < 931)
+	#pragma message("GCC is " STR(__GNUC__)"."STR(__GNUC_MINOR__)"."STR(__GNUC_PATCHLEVEL__))
+	#error "GCC compiler >= 9.3.1 required"
+#endif
+
+#if (GCC_VERSION > 1000)
+	#pragma message("GCC is " STR(__GNUC__)"."STR(__GNUC_MINOR__)"."STR(__GNUC_PATCHLEVEL__))
+	#error "GCC10 not supported see https://github.com/rusefi/rusefi/labels/Gcc10"
+#endif
+
+
+
+#endif
diff --git a/firmware/pch/pch.h b/firmware/pch/pch.h
index 50a13ddb17..1dd48a2b93 100644
--- a/firmware/pch/pch.h
+++ b/firmware/pch/pch.h
@@ -37,10 +37,6 @@
 #include "hardware.h"
 #include "thread_priority.h"
 
-#if EFI_PROD_CODE
-#include "version_check.h"
-#endif
-
 #if EFI_UNIT_TEST
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
diff --git a/firmware/version_check.h b/firmware/version_check.h
deleted file mode 100644
index 79a6376d29..0000000000
--- a/firmware/version_check.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// This file asserts that the compiler is appropriate for rusEFI use.
-
-#pragma once
-
-// non-MCU builds are significantly more tolerant
-#if EFI_PROD_CODE
-
-static constexpr auto gccVersion = (__GNUC__ * 100) + (__GNUC_MINOR__ * 10) + ( __GNUC_PATCHLEVEL__ );
-
-// Firmware builds require at least GCC 9.3.1
-static_assert(gccVersion >= 931, "GCC compiler >= 9.3.1 required");
-
-static_assert(gccVersion < 1000, "GCC10 not supported see https://github.com/rusefi/rusefi/labels/Gcc10");
-
-#endif