From a19ce12e4700615ebdd5f2a7ad1dcc31d744370f Mon Sep 17 00:00:00 2001 From: Pengyu Lv Date: Fri, 24 Feb 2023 15:38:52 +0800 Subject: [PATCH 1/2] all.sh: Skip build_mingw correctly If i686-w64-mingw32-gcc is not installed, then build_mingw should be unsupported. Signed-off-by: Pengyu Lv --- tests/scripts/all.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 2da9fe20f..22018ebe4 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -3211,8 +3211,8 @@ component_build_mingw () { make WINDOWS_BUILD=1 clean } support_build_mingw() { - case $(i686-w64-mingw32-gcc -dumpversion) in - [0-5]*) false;; + case $(i686-w64-mingw32-gcc -dumpversion 2>/dev/null) in + [0-5]*|"") false;; *) true;; esac } From d216c0411d80552d599530596e3d8dc7481c250b Mon Sep 17 00:00:00 2001 From: Pengyu Lv Date: Fri, 3 Mar 2023 18:23:35 +0800 Subject: [PATCH 2/2] all.sh: add support function for build_armcc With this change, "--list-components" will not list "build_armcc" on the system which is not installed with Arm Compilers. Signed-off-by: Pengyu Lv --- tests/scripts/all.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 22018ebe4..87defc0ce 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -3181,6 +3181,11 @@ component_build_armcc () { # ARM Compiler 6 - Target ARMv8-A - AArch64 armc6_build_test "--target=aarch64-arm-none-eabi -march=armv8.2-a" } +support_build_armcc () { + armc5_cc="$ARMC5_BIN_DIR/armcc" + armc6_cc="$ARMC6_BIN_DIR/armclang" + (check_tools "$armc5_cc" "$armc6_cc" > /dev/null 2>&1) +} component_build_ssl_hw_record_accel() { msg "build: default config with MBEDTLS_SSL_HW_RECORD_ACCEL enabled"