commit ff5d7711e9667836631d04f81508587bd805fa75
author Xinyu Zhang <xinyu.zhang@arm.com> Fri Jan 14 13:48:59 2022 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Fri Jan 14 17:25:17 2022 +0800
tree d4e67aef8ce32957918c3835b47964d0cb4a6470
parent 8d2887140384ad6047d0c109abd2002e506c3619

Build: Specify compiler path in bash

This patch is to prepare CI scripts to support multi compiler versions.
All versions of compilers will be installed by DockerFile to specific
path. The paths will be recoreded in env variables.
Every single config build job can select the needed compiler version
and add the specific compiler path to env PATH.

By default, GCC v7.3.1 & ARMClang 6.13 are choosen.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: Id4bafadfd28e95a14dc26c7641bcf9611c65e58a

tfm_ci_pylib/tfm_build_manager.py

diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index 1b0f7c8..d8a58bb 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -120,6 +120,19 @@
 
         super(TFM_Build_Manager, self).__init__(name="TFM_Build_Manager")
 
+    def set_compiler_version(self, config):
+        compiler_version = ""
+        # Set GCC version
+        if "GNUARM" in config.toolchain_file:
+            # Use GCC v7.3.1 by default
+            compiler_version = "GCC_7_3_1"
+        # Set ARMClang version
+        elif "ARMCLANG" in config.toolchain_file:
+            # Use ARMClang v6.13 by default
+            compiler_version = "ARMCLANG_6_13"
+
+        return compiler_version
+
     def get_config(self):
             return list(self._tbm_build_cfg.keys())
 
@@ -137,6 +150,7 @@
             "CONFIG_NAME={}",
             "TFM_PLATFORM={}",
             "TOOLCHAIN_FILE={}",
+            "COMPILER_VERSION={}",
             "LIB_MODEL={}",
             "ISOLATION_LEVEL={}",
             "TEST_REGRESSION={}",
@@ -157,6 +171,7 @@
                 config,
                 config_details.tfm_platform,
                 config_details.toolchain_file,
+                self.set_compiler_version(config_details),
                 config_details.lib_model,
                 config_details.isolation_level,
                 config_details.test_regression,