Merge pull request #618 from sourceryinstitute/fix-compiler-version-check

Fix installer's minimum-version check for gcc

Author: Damian Rouson

prerequisites/install-functions/find_or_install.sh

@@ -173,11 +173,12 @@ find_or_install()
 
         else
 
-          info "$this_script: Checking whether $executable in PATH wraps gfortran version >= $minimum_version... "
+          export minimum_acceptable_version=$(./build.sh -V gcc)
+          info "$this_script: Checking whether $executable in PATH wraps gfortran version >= $minimum_acceptable_version... "
           $executable acceptable_compiler.f90 -o acceptable_compiler || true;
           $executable print_true.f90 -o print_true || true;
           if [[ -f ./acceptable_compiler && -f ./print_true ]]; then
-            acceptable=$(./acceptable_compiler $minimum_version)
+            acceptable=$(./acceptable_compiler $minimum_acceptable_version)
             is_true=$(./print_true)
             rm acceptable_compiler print_true
           else
@@ -278,9 +279,8 @@ find_or_install()
       $executable -o print_true print_true.f90 || true;
       if [[ -f ./acceptable_compiler && -f ./print_true ]]; then
         is_true=$(./print_true)
-        emergency "Executing `./acceptable_compiler $minimum_version`"
-        ./acceptable_compiler $minimum_version
-        acceptable=$(./acceptable_compiler $minimum_version)
+        info "Executing './acceptable_compiler $minimum_acceptable_version'"
+        acceptable=$(./acceptable_compiler $minimum_acceptable_version)
         rm acceptable_compiler print_true
       else
         acceptable=false