[projmgr, buildmgr] Shift toolchain registration enforcement from pro…

…ject to build management
Open-CMSIS-Pack · Jul 18, 2024 · 4fde508 · 4fde508
1 parent 0d2b3d0
commit 4fde508
Show file tree

Hide file tree

Showing 116 changed files with 187 additions and 161 deletions.
diff --git a/.github/workflows/buildmgr.yml b/.github/workflows/buildmgr.yml
@@ -308,6 +308,8 @@ jobs:
       CI_CBUILD_INSTALLER: ${{ github.workspace }}/cbuild_install.sh
       CMSIS_PACK_ROOT: ${{ github.workspace }}/packs
       GCC_TOOLCHAIN_ROOT: ${{ github.workspace }}/${{ matrix.toolchain_root }}
+      GCC_TOOLCHAIN_10_3_1: ${{ github.workspace }}/${{ matrix.toolchain_root }}
+      AC6_TOOLCHAIN_6_18_0: ${{ github.workspace }}/${{ matrix.toolchain_root }}
       CI_ARCH: ${{ matrix.arch }}
     strategy:
       #fail-fast: true
@@ -460,6 +462,8 @@ jobs:
         lcov_installer: lcov-1.15.tar.gz
         CMSIS_PACK_ROOT: ${{ github.workspace }}/packs
         GCC_TOOLCHAIN_ROOT: ${{ github.workspace }}/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi/bin
+        GCC_TOOLCHAIN_10_3_1: ${{ github.workspace }}/${{ matrix.toolchain_root }}
+        AC6_TOOLCHAIN_6_18_0: ${{ github.workspace }}/${{ matrix.toolchain_root }}
     runs-on: ubuntu-22.04
     timeout-minutes: 15
     strategy:

diff --git a/tools/buildmgr/cbuild/src/CbuildModel.cpp b/tools/buildmgr/cbuild/src/CbuildModel.cpp
@@ -473,10 +473,9 @@ bool CbuildModel::GetCompatibleToolchain(const string& name, const string& versi
   }
 
   if (selectedVersion.empty()) {
-    // no compatible registered toolchain was found, search for a suitable config file
-    if (GetToolchainConfig(toolchainConfigFiles, name, versionRange)) {
-      return true;
-    }
+    // no compatible registered toolchain was found
+    LogMsg("M616", VAL("NAME", name));
+    return false;
   } else {
     // registered toolchain was found
     m_toolchainRegisteredVersion = selectedVersion;

diff --git a/tools/buildmgr/cbuild/src/CbuildMsgs.cpp b/tools/buildmgr/cbuild/src/CbuildMsgs.cpp
@@ -82,6 +82,7 @@ void InitMessageTable()
   table["M613"] = MessageEntry(MsgLevel::LEVEL_ERROR,    CRLF_B,   "File '%PATH%' has unexpected format!"                                        );
   table["M614"] = MessageEntry(MsgLevel::LEVEL_ERROR,    CRLF_B,   "Missing access sequence delimiter: '%ACCSEQDELIM%'!"                         );
   table["M615"] = MessageEntry(MsgLevel::LEVEL_ERROR,    CRLF_B,   "%PROP% '%VAL%' was not found in the loaded packs!"                           );
+  table["M616"] = MessageEntry(MsgLevel::LEVEL_ERROR,    CRLF_B,   "compiler registration environment variable missing, format: %NAME%_TOOLCHAIN_<major>_<minor>_<patch>");
 
   table["M630"] = MessageEntry(MsgLevel::LEVEL_WARNING,  CRLF_B,   "Device '%DEV%' is substituted with variant '%VAR%'."                         );
   table["M631"] = MessageEntry(MsgLevel::LEVEL_WARNING,  CRLF_B,   "Project must have exactly one target element!"                               );

diff --git a/tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake b/tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake
@@ -2,13 +2,6 @@
 #
 #   - Applies to toolchain: ARM Compiler 6.16.2 and greater
 
-############### EDIT BELOW ###############
-# Set base directory of toolchain
-set(TOOLCHAIN_ROOT)
-set(TOOLCHAIN_VERSION "6.16.2")
-
-############ DO NOT EDIT BELOW ###########
-
 set(AS "armasm")
 set(CC "armclang")
 set(CXX "armclang")
@@ -17,12 +10,8 @@ set(LD "armlink")
 set(AR "armar")
 set(OC "fromelf")
 
-if(DEFINED REGISTERED_TOOLCHAIN_ROOT)
-  set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
-endif()
-if(DEFINED REGISTERED_TOOLCHAIN_VERSION)
-  set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
-endif()
+set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
+set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
 
 if(DEFINED TOOLCHAIN_ROOT AND NOT TOOLCHAIN_ROOT STREQUAL "")
   set(EXT)

diff --git a/tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake b/tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake
@@ -2,25 +2,14 @@
 #
 #   - Applies to toolchain: LLVM/Clang Bare Metal Toolchain for the Arm Architecture 16.0.0 and greater
 
-############### EDIT BELOW ###############
-# Set base directory of toolchain
-set(TOOLCHAIN_ROOT)
-set(TOOLCHAIN_VERSION "17.0.1")
-
-############ DO NOT EDIT BELOW ###########
-
 set(AS "clang")
 set(CC "clang")
 set(CXX "clang++")
 set(CPP "clang")
 set(OC "llvm-objcopy")
 
-if(DEFINED REGISTERED_TOOLCHAIN_ROOT)
-  set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
-endif()
-if(DEFINED REGISTERED_TOOLCHAIN_VERSION)
-  set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
-endif()
+set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
+set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
 
 if(DEFINED TOOLCHAIN_ROOT)
   set(PREFIX)

diff --git a/tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake b/tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake
@@ -2,25 +2,14 @@
 #
 #   - Applies to toolchain: GNU Toolchain for the Arm Architecture 10.3.1 and greater
 
-############### EDIT BELOW ###############
-# Set base directory of toolchain
-set(TOOLCHAIN_ROOT)
-set(TOOLCHAIN_VERSION "10.3.1")
-
-############ DO NOT EDIT BELOW ###########
-
 set(AS "as")
 set(CC "gcc")
 set(CXX "g++")
 set(CPP "gcc")
 set(OC "objcopy")
 
-if(DEFINED REGISTERED_TOOLCHAIN_ROOT)
-  set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
-endif()
-if(DEFINED REGISTERED_TOOLCHAIN_VERSION)
-  set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
-endif()
+set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
+set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
 
 if(DEFINED TOOLCHAIN_ROOT)
   set(PREFIX arm-none-eabi-)

diff --git a/tools/buildmgr/cbuildgen/config/IAR.9.32.1.cmake b/tools/buildmgr/cbuildgen/config/IAR.9.32.1.cmake
@@ -5,13 +5,6 @@
 #    V1: Initial support
 #    V2: Support for 32-bit Cortex M,A and R
 
-############### EDIT BELOW ###############
-# Set base directory of toolchain
-set(TOOLCHAIN_ROOT)
-set(TOOLCHAIN_VERSION "9.32.1")
-
-############ DO NOT EDIT BELOW ###########
-
 set(AS "iasmarm")
 set(CC "iccarm")
 set(CXX "iccarm")
@@ -20,12 +13,8 @@ set(AR "iarchive")
 set(CPP "iccarm")
 set(OC "ielftool")
 
-if(DEFINED REGISTERED_TOOLCHAIN_ROOT)
-  set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
-endif()
-if(DEFINED REGISTERED_TOOLCHAIN_VERSION)
-  set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
-endif()
+set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
+set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
 
 if(DEFINED TOOLCHAIN_ROOT)
   set(EXT)

diff --git a/tools/buildmgr/test/testinput/Examples/AC6/ArmAsm/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/ArmAsm/CMakeLists.txt.ref
@@ -35,6 +35,8 @@ set(AS_ARM_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/AC6/Asm/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/Asm/CMakeLists.txt.ref
@@ -78,6 +78,8 @@ set(AS_FLAGS_C:/sandbox/devtools/build/TestOutput/TestData/Examples/AC6/Asm/AsmA
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/AC6/BranchProtection/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/BranchProtection/CMakeLists.txt.ref
@@ -48,6 +48,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.18.0")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/AC6/Build_AC6/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/Build_AC6/CMakeLists.txt.ref
@@ -48,6 +48,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/AC6/Build_AC6PP/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/Build_AC6PP/CMakeLists.txt.ref
@@ -52,6 +52,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/AC6/Flags/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/Flags/CMakeLists.txt.ref
@@ -55,6 +55,8 @@ set(CC_FLAGS_C:/Users/Test/AppData/Local/Arm/Packs/ARM/CMSIS/5.8.0/CMSIS/RTOS2/R
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/AC6/Library/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/Library/CMakeLists.txt.ref
@@ -35,6 +35,8 @@ set(CXX_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/AC6/Minimal/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/Minimal/CMakeLists.txt.ref
@@ -30,6 +30,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/AC6/NestedGroups/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/NestedGroups/CMakeLists.txt.ref
@@ -62,6 +62,8 @@ set(CC_FLAGS_C:/sandbox/devtools/build/TestOutput/TestData/Examples/AC6/NestedGr
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/AC6/RelativePath/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/RelativePath/CMakeLists.txt.ref
@@ -34,6 +34,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/AC6/TrustZone/CM33_ns/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/TrustZone/CM33_ns/CMakeLists.txt.ref
@@ -49,6 +49,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("sandbox/cbuild/etc/AC6.6.18.0.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/AC6/TrustZone/CM33_s/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/TrustZone/CM33_s/CMakeLists.txt.ref
@@ -42,6 +42,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/AC6/Whitespace/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/Whitespace/CMakeLists.txt.ref
@@ -48,6 +48,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/GCC/AccessSequence/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/AccessSequence/CMakeLists.txt.ref
@@ -128,6 +128,8 @@ set(CXX_FLAGS_C:/Temp/devtools/tools/buildmgr/test/testinput/Examples/GCC/Access
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/GCC/Asm/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/Asm/CMakeLists.txt.ref
@@ -125,6 +125,8 @@ set(AS_FLAGS_C:/sandbox/devtools/build/TestOutput/TestData/Examples/GCC/Asm/GAS.
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/GCC/BranchProtection/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/BranchProtection/CMakeLists.txt.ref
@@ -48,6 +48,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "10.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/GCC/Build_GCC/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/Build_GCC/CMakeLists.txt.ref
@@ -51,6 +51,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/GCC/Build_GPP/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/Build_GPP/CMakeLists.txt.ref
@@ -55,6 +55,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/GCC/DupFilename/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/DupFilename/CMakeLists.txt.ref
@@ -32,6 +32,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/GCC/FlagOrder/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/FlagOrder/CMakeLists.txt.ref
@@ -38,6 +38,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/GCC/Flags/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/Flags/CMakeLists.txt.ref
@@ -55,6 +55,8 @@ set(CC_FLAGS_C:/Users/Test/AppData/Local/Arm/Packs/ARM/CMSIS/5.8.0/CMSIS/RTOS2/R
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/GCC/Library/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/Library/CMakeLists.txt.ref
@@ -35,6 +35,8 @@ set(CXX_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "10.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.2.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/GCC/LibraryCustom/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/LibraryCustom/CMakeLists.txt.ref
@@ -35,6 +35,8 @@ set(CXX_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "10.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.2.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessing/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessing/CMakeLists.txt.ref
@@ -45,6 +45,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessingDefines/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessingDefines/CMakeLists.txt.ref
@@ -62,6 +62,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessingSrcFile/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessingSrcFile/CMakeLists.txt.ref
@@ -39,6 +39,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")

diff --git a/tools/buildmgr/test/testinput/Examples/GCC/Minimal/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/Minimal/CMakeLists.txt.ref
@@ -40,6 +40,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")