Skip to content

Commit ebc6f30

Browse files
author
Damian Rouson
authored
Merge pull request #628 from sourceryinstitute/fix-compiler-min-ver-check
Fix compiler min ver check
2 parents b951af9 + 4ca070b commit ebc6f30

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

prerequisites/install-functions/find_or_install.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@ find_or_install()
173173

174174
else
175175

176-
export minimum_acceptable_version=$(./build.sh -V gcc)
177-
info "$this_script: Checking whether $executable in PATH wraps gfortran version >= $minimum_acceptable_version... "
176+
export minimum_compiler_version=$(./build.sh -V gcc)
177+
info "$this_script: Checking whether $executable in PATH wraps gfortran version >= $minimum_compiler_version... "
178178
$executable acceptable_compiler.f90 -o acceptable_compiler || true;
179179
$executable print_true.f90 -o print_true || true;
180180
if [[ -f ./acceptable_compiler && -f ./print_true ]]; then
181-
acceptable=$(./acceptable_compiler $minimum_acceptable_version)
181+
acceptable=$(./acceptable_compiler $minimum_compiler_version)
182182
is_true=$(./print_true)
183183
rm acceptable_compiler print_true
184184
else
@@ -279,8 +279,8 @@ find_or_install()
279279
$executable -o print_true print_true.f90 || true;
280280
if [[ -f ./acceptable_compiler && -f ./print_true ]]; then
281281
is_true=$(./print_true)
282-
info "Executing './acceptable_compiler $minimum_acceptable_version'"
283-
acceptable=$(./acceptable_compiler $minimum_acceptable_version)
282+
info "Executing './acceptable_compiler $minimum_version'"
283+
acceptable=$(./acceptable_compiler $minimum_version)
284284
rm acceptable_compiler print_true
285285
else
286286
acceptable=false

0 commit comments

Comments
 (0)