@@ -19,19 +19,19 @@ case "$compiler" in
1919 # clangx.y or clang-x.y
2020 version=" $( echo " $compiler " | tr -d ' [:alpha:]-=' ) "
2121 majorVersion=" ${version%% .* } "
22- [ -z " ${version##* .* } " && minorVersion=" ${version#* .} "
2322
24- if [ -z " $minorVersion " && [ -n " $majorVersion " && [ " $majorVersion " -le 6 ]; then
25- minorVersion=0;
26- fi
23+ # LLVM based on v18 released in early 2024, with two releases per year
24+ maxVersion=" $(( 18 + ((($(date +% Y) - 2024 ) * 12 + $(date +% m) - 3 ) / 6 )) "
2725 compiler=clang
2826 ;;
2927
3028 gcc* |-gcc* |--gcc* )
3129 # gccx.y or gcc-x.y
3230 version=" $( echo " $compiler " | tr -d ' [:alpha:]-=' ) "
3331 majorVersion=" ${version%% .* } "
34- [ -z " ${version##* .* } " && minorVersion=" ${version#* .} "
32+
33+ # GCC based on v14 released in early 2024, with one release per year
34+ maxVersion=" $(( 14 + ((($(date +% Y) - 2024 ) * 12 + $(date +% m) - 3 ) / 12 )) "
3535 compiler=gcc
3636 ;;
3737esac
@@ -49,12 +49,10 @@ check_version_exists() {
4949 desired_version=-1
5050
5151 # Set up the environment to be used for building with the desired compiler.
52- if command -v " $compiler -$1 .$2 " > /dev/null; then
53- desired_version=" -$1 .$2 "
54- elif command -v " $compiler $1$2 " > /dev/null; then
55- desired_version=" $1$2 "
56- elif command -v " $compiler -$1$2 " > /dev/null; then
57- desired_version=" -$1$2 "
52+ if command -v " $compiler -$1 " > /dev/null; then
53+ desired_version=" -$1 "
54+ elif command -v " $compiler $1 " > /dev/null; then
55+ desired_version=" $1 "
5856 fi
5957
6058 echo " $desired_version "
@@ -75,7 +73,7 @@ set_compiler_version_from_CC() {
7573 fi
7674
7775 # gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments.
78- IFS=. read -r majorVersion minorVersion _ << EOF
76+ IFS=. read -r majorVersion _ << EOF
7977$version
8078EOF
8179}
@@ -84,43 +82,29 @@ if [ -z "$CLR_CC" ]; then
8482
8583 # Set default versions
8684 if [ -z " $majorVersion " ; then
87- # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
88- if [ " $compiler " = " clang" ; then versions=" 18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
89- elif [ " $compiler " = " gcc" ; then versions=" 14 13 12 11 10 9 8 7 6 5 4.9" ; fi
90-
91- for version in $versions ; do
92- _major=" ${version%% .* } "
93- [ -z " ${version##* .* } " && _minor=" ${version#* .} "
94- desired_version=" $( check_version_exists " $_major " " $_minor " ) "
95- if [ " $desired_version " != " -1" ; then majorVersion=" $_major " ; break ; fi
85+ minVersion=8
86+ maxVersion=" $(( maxVersion + 1 )) " # +1 for headspace
87+ i=" $maxVersion "
88+ while [ " $i " -ge $minVersion ]; do
89+ desired_version=" $( check_version_exists " $i " ) "
90+ if [ " $desired_version " != " -1" ; then majorVersion=" $i " ; break ; fi
91+ i=$(( i - 1 ))
9692 done
9793
9894 if [ -z " $majorVersion " ; then
9995 if ! command -v " $compiler " > /dev/null; then
100- echo " Error: No usable version of $compiler found."
96+ echo " Error: No compatible version of $compiler was found within the range of $minVersion to $maxVersion . Please upgrade your toolchain or specify the compiler explicitly using CLR_CC and CLR_CXX environment variables ."
10197 exit 1
10298 fi
10399
104100 CC=" $( command -v " $compiler " 2> /dev/null) "
105101 CXX=" $( command -v " $cxxCompiler " 2> /dev/null) "
106102 set_compiler_version_from_CC
107- else
108- if [ " $compiler " = " clang" && [ " $majorVersion " -lt 5 ] && { [ " $build_arch " = " arm" || [ " $build_arch " = " armel" ; }; then
109- # If a major version was provided explicitly, and it was too old, find a newer compiler instead
110- if ! command -v " $compiler " > /dev/null; then
111- echo " Error: Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
112- exit 1
113- fi
114-
115- CC=" $( command -v " $compiler " 2> /dev/null) "
116- CXX=" $( command -v " $cxxCompiler " 2> /dev/null) "
117- set_compiler_version_from_CC
118- fi
119103 fi
120104 else
121- desired_version=" $( check_version_exists " $majorVersion " " $minorVersion " ) "
105+ desired_version=" $( check_version_exists " $majorVersion " ) "
122106 if [ " $desired_version " = " -1" ; then
123- echo " Error: Could not find specific version of $compiler : $majorVersion $minorVersion ."
107+ echo " Error: Could not find specific version of $compiler : $majorVersion ."
124108 exit 1
125109 fi
126110 fi
![dotnet-maestro[bot]](https://avatars.githubusercontent.com/in/16706?v=4&size=40){kind=avatar}
0 commit comments