compiler: arcmwdt: Fix ccac version checking

Regexp suggested in zephyrproject-rtos#50173 PR is too strictly and needs to be corrected. Previous regexp declines engineering MWDT versions (pattern ENG-2022.12-D1039-C39098348"). Signed-off-by: Nikolay Agishev <[email protected]>
juyangbai · Oct 28, 2022 · 75bb8ce · 75bb8ce
1 parent 192d01e
commit 75bb8ce
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/cmake/compiler/arcmwdt/generic.cmake b/cmake/compiler/arcmwdt/generic.cmake
@@ -40,14 +40,15 @@ if(ret)
 else()
   set(ARCMWDT_MIN_REQUIRED_VERS "2022.06")
 #
-# Regular version have format: "T-2022.06"
+# Regular version has format: "T-2022.06"
 # Engineering builds: "ENG-2022.06-001"
+# Check-in build: ENG-2022.12-D1039-C39098348
 #
-  string(REGEX MATCH "\ (ENG|[A-Z])-[0-9][0-9][0-9][0-9]\.[0-9][0-9]+((\ |\n|\r|\t)|(-[0-9][0-9][0-9]))"
-   vers_string "${full_version_output}")
+  string(REGEX MATCH "\ (ENG|[A-Z])-[0-9][0-9][0-9][0-9]\.[0-9][0-9]+.*"
+    vers_string "${full_version_output}")
 
   string(REGEX MATCH "[0-9][0-9][0-9][0-9]\.[0-9][0-9]"
-     reduced_version "${vers_string}")
+    reduced_version "${vers_string}")
 
   if("${reduced_version}" VERSION_LESS ${ARCMWDT_MIN_REQUIRED_VERS})
     message(FATAL_ERROR "Could NOT find ccac: Found unsuitable version \"${reduced_version}\", but required is at least \"${ARCMWDT_MIN_REQUIRED_VERS}\" (found ${CROSS_COMPILE}ccac)")