Skip to content

Commit df2a943

Browse files
Damian Rousonzbeekman
authored andcommitted
Disallow GCC 7 builds
If the script detects GCC 7.0.0, the installation script will download and install 6.1.0 due to incompatilibies between the library and the current trunk.
1 parent 3ddd291 commit df2a943

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

install.sh-usage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-b --install-branch [arg] Install the specified repository development branch.
1+
-b --install-branch [arg] Install the specified repository development branch.
22
-B --list-branches [arg] List the available branches in the specified package's repository.
33
-c --with-c [arg] Use specified C compiler.
44
-C --with-cxx [arg] Use specified C++ compiler.

prerequisites/acceptable_compiler.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
program main
3636
use iso_fortran_env, only : compiler_version
3737
implicit none
38-
print *,compiler_version() >= "GCC version 6.1.0 "
38+
print *,(compiler_version() >= "GCC version 6.1.0 ") .and. (compiler_version() < "GCC version 7.0.0 ")
3939
end program

prerequisites/install-functions/find_or_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ find_or_install()
163163

164164
else
165165

166-
echo -e "$this_script: Checking whether $executable in PATH wraps gfortran version $(./build.sh -V gcc) or later... "
166+
echo -e "$this_script: Checking whether $executable in PATH wraps gfortran version >= $(./build.sh -V gcc) and < 7.0.0 ... "
167167
$executable acceptable_compiler.f90 -o acceptable_compiler
168168
$executable print_true.f90 -o print_true
169169
acceptable=$(./acceptable_compiler)

0 commit comments

Comments
 (0)