cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-10-02 10:00:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8766 from tom-cosgrove-arm/unify-clang-version-checking-in-all.sh

Browse Source 
Unify clang version checking in all.sh
This commit is contained in:
Paul Elliott 2024-01-31 12:51:34 +00:00 committed by GitHub
commit 1ee85b4c61
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/scripts/all.sh
View File

@ -821,6 +821,14 @@ pre_generate_files() {
fi fi
} }
clang_version() {
if command -v clang > /dev/null ; then
clang --version|grep version|sed -E 's#.*version ([0-9]+).*#\1#'
else
echo 0 # report version 0 for "no clang"
fi
}
################################################################ ################################################################
#### Helpers for components using libtestdriver1 #### Helpers for components using libtestdriver1
################################################################ ################################################################
@ -4692,14 +4700,8 @@ component_test_aesni_m32 () { # ~ 60s
} }
support_test_aesni_m32_clang() { support_test_aesni_m32_clang() {
support_test_aesni_m32 && if command -v clang > /dev/null ; then
# clang >= 4 is required to build with target attributes # clang >= 4 is required to build with target attributes
clang_ver="$(clang --version|grep version|sed -E 's#.*version ([0-9]+).*#\1#')" support_test_aesni_m32 && [[ $(clang_version) -ge 4 ]]
[[ "${clang_ver}" -ge 4 ]]
else
# clang not available
false
fi
} }
component_test_aesni_m32_clang() { component_test_aesni_m32_clang() {
@ -4750,9 +4752,8 @@ component_build_aes_aesce_armcc () {
} }
support_build_aes_armce() { support_build_aes_armce() {
# clang >= 4 is required to build with AES extensions # clang >= 11 is required to build with AES extensions
ver="$(clang --version|grep version|sed -E 's#.*version ([0-9]+).*#\1#')" [[ $(clang_version) -ge 11 ]]
[ "${ver}" -ge 11 ]
} }
component_build_aes_armce () { component_build_aes_armce () {
@ -4807,15 +4808,8 @@ component_build_aes_armce () {
} }
support_build_sha_armce() { support_build_sha_armce() {
if command -v clang > /dev/null ; then
# clang >= 4 is required to build with SHA extensions # clang >= 4 is required to build with SHA extensions
clang_ver="$(clang --version|grep version|sed -E 's#.*version ([0-9]+).*#\1#')" [[ $(clang_version) -ge 4 ]]
[[ "${clang_ver}" -ge 4 ]]
else
# clang not available
false
fi
} }
component_build_sha_armce () { component_build_sha_armce () {