Build: Specify compiler version in every configs
To make build configs more flexible in Open CI,
specify compiler version in each configs.
This patch makes it possible to build same config
with different versions of compiler.
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I88eb3e927f85731376b5a0de08533765f7b8b535
diff --git a/run-build.sh b/run-build.sh
index 20f602b..2302479 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -29,20 +29,10 @@
python --version
make --version
-# Export specific compiler path to env PATH
-compiler_path="${COMPILER_VERSION}_PATH"
-export PATH=$PATH:"${!compiler_path}"
-# Show compiler version
-if [[ $COMPILER_VERSION =~ "ARMCLANG" ]] ; then
- armclang --version
-else
- arm-none-eabi-gcc --version
-fi
-
set -ex
build_commands=$(python3 tf-m-ci-scripts/configs.py -b -g all $CONFIG_NAME)
-if [ $CODE_COVERAGE_EN = "TRUE" ] && [[ $CONFIG_NAME =~ "GNUARM" ]] ; then
+if [ $CODE_COVERAGE_EN = "TRUE" ] && [[ $CONFIG_NAME =~ "GCC" ]] ; then
build_commands=${build_commands/toolchain_GNUARM.cmake/toolchain_GNUARM.cmake -DTFM_CODE_COVERAGE=True}
echo "Flag: Add compiler flag for build with code coverage supported."
echo $build_commands