<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/d380ffc4e4ba32b7045c98e4e3abb97832c8b9c5">https://github.com/macports/macports-base/commit/d380ffc4e4ba32b7045c98e4e3abb97832c8b9c5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d380ffc4e4ba32b7045c98e4e3abb97832c8b9c5
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Aug 3 17:30:27 2019 +1000
<span style='display:block; white-space:pre;color:#404040;'> Simplify compiler version selection code
</span>---
src/port1.0/portconfigure.tcl | 170 +++++++++++++++++++++---------------------
1 file changed, 87 insertions(+), 83 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index cbf6c3b..a7330dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -671,9 +671,13 @@ proc portconfigure::configure_get_fortran_compiler {} {
</span> }
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# internal utility procedure to get a version larger than any compiler version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc portconfigure::max_compiler_version {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 999999999999999999999.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# internal utility procedure to return the greater of two versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc portconfigure::max_version {verA verB} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $verA $verB] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return $verA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return $verB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
#
# https://releases.llvm.org/3.1/docs/ClangReleaseNotes.html#cchanges
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -718,141 +722,137 @@ proc portconfigure::max_compiler_version {} {
</span> # utility procedure: get minimum command line compilers version based on restrictions
proc portconfigure::get_min_command_line {compiler} {
global compiler.c_standard compiler.cxx_standard compiler.openmp_version compiler.thread_local_storage os.major
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set min_values 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${compiler.openmp_version} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${compiler.thread_local_storage} && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # thread-local storage only works on Mac OS X Lion and above
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # GCC & MacPorts Clang emulate thread-local storage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.cxx_stdlib] eq "macports-libstdc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> switch ${compiler} {
clang {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.cxx_stdlib] eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cxx [file tail [portconfigure::configure_get_compiler cxx ${compiler}]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${cxx} ne "clang++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 3.2 <= Xcode < 4.0 does not provide clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {${compiler.c_standard} >= 2011} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 318.0.61
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 318.0.61]
</span> }
if {${compiler.cxx_standard} >= 2017} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 902.0.39.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 902.0.39.1]
</span> } elseif {${compiler.cxx_standard} >= 2014} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 600.0.54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 600.0.54]
</span> } elseif {${compiler.cxx_standard} >= 2011} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 500.2.75
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option configure.cxx_stdlib] eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cxx [lindex [split [portconfigure::configure_get_compiler cxx ${compiler}] /] end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${cxx} ne "clang++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 3.2 <= Xcode < 4.0 does not provide clang++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values [max_compiler_version]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 500.2.75]
</span> }
}
llvm-gcc-4.2 -
gcc-4.2 -
gcc-4.0 -
apple-gcc-4.2 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${compiler.c_standard} > 1999} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values [max_compiler_version]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${compiler.cxx_standard} >= 2011} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values [max_compiler_version]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option configure.cxx_stdlib] eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values [max_compiler_version]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${compiler.c_standard} > 1999 || ${compiler.cxx_standard} >= 2011 || [option configure.cxx_stdlib] eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return none
</span> }
}
default {
return -code error "don't recognize compiler \"${compiler}\""
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${compiler.openmp_version} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values [max_compiler_version]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${compiler.thread_local_storage}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # thread-local storage only works on Mac OS X Lion and above
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # GCC & MacPorts Clang emulate thread-local storage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values [max_compiler_version]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option configure.cxx_stdlib] eq "macports-libstdc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values [max_compiler_version]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [lindex [lsort -decreasing -command vercmp ${min_values}] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${min_value}
</span> }
# utility procedure: get minimum Clang version based on restrictions
proc portconfigure::get_min_clang {} {
global compiler.c_standard compiler.cxx_standard compiler.openmp_version compiler.thread_local_storage
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set min_values 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value 1.0
</span> if {${compiler.c_standard} >= 2011} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 3.1]
</span> }
if {${compiler.cxx_standard} >= 2017} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 5.0]
</span> } elseif {${compiler.cxx_standard} >= 2014} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 3.4]
</span> } elseif {${compiler.cxx_standard} >= 2011} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 3.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 3.3]
</span> }
if {[vercmp ${compiler.openmp_version} 4.0] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 6.0]
</span> } elseif {[vercmp ${compiler.openmp_version} 2.5] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 3.8]
</span> }
if {${compiler.thread_local_storage}} {
# MacPorts patches certain versions of Clang to emulate thread-local storage
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 5.0]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [lindex [lsort -decreasing -command vercmp ${min_values}] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${min_value}
</span> }
# utility procedure: get minimum GCC version based on restrictions
proc portconfigure::get_min_gcc {} {
global compiler.c_standard compiler.cxx_standard compiler.openmp_version compiler.thread_local_storage
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set min_values 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.cxx_stdlib] ne "" && [option configure.cxx_stdlib] ne "macports-libstdc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value 1.0
</span> if {${compiler.c_standard} >= 2011} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 4.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 4.3]
</span> } elseif {${compiler.c_standard} >= 1999} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 4.0]
</span> }
if {${compiler.cxx_standard} >= 2017} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 7.0]
</span> } elseif {${compiler.cxx_standard} >= 2014} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 5.0]
</span> } elseif {${compiler.cxx_standard} >= 2011} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 4.8.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 4.8.1]
</span> }
if {[vercmp ${compiler.openmp_version} 4.5] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 8.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 8.1]
</span> } elseif {[vercmp ${compiler.openmp_version} 4.0] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 4.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 4.9]
</span> } elseif {[vercmp ${compiler.openmp_version} 3.1] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 4.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 4.7]
</span> } elseif {[vercmp ${compiler.openmp_version} 3.0] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 4.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 4.4]
</span> } elseif {[vercmp ${compiler.openmp_version} 2.5] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 4.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 4.4]
</span> }
if {${compiler.thread_local_storage}} {
# GCC emulates thread-local storage, but it seems to be broken on older versions of GCC
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 4.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option configure.cxx_stdlib] ne "" && [option configure.cxx_stdlib] ne "macports-libstdc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values [max_compiler_version]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 4.5]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [lindex [lsort -decreasing -command vercmp ${min_values}] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${min_value}
</span> }
# utility procedure: get minimum Gfortran version based on restrictions
proc portconfigure::get_min_gfortran {} {
global compiler.openmp_version compiler.thread_local_storage
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set min_values 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value 1.0
</span> if {[vercmp ${compiler.openmp_version} 4.5] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 8.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 8.1]
</span> } elseif {[vercmp ${compiler.openmp_version} 4.0] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 4.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 4.9]
</span> } elseif {[vercmp ${compiler.openmp_version} 3.1] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 4.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[vercmp ${compiler.openmp_version} 3.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 4.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 4.7]
</span> } elseif {[vercmp ${compiler.openmp_version} 2.5] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 4.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 4.4]
</span> }
if {${compiler.thread_local_storage}} {
# GCC emulates thread-local storage, but it seems to be broken on older versions of GCC
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend min_values 4.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 4.5]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [lindex [lsort -decreasing -command vercmp ${min_values}] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${min_value}
</span> }
#
proc portconfigure::g95_ok {} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1025,26 +1025,30 @@ proc portconfigure::get_compiler_fallback {} {
</span> }
set system_compilers ""
foreach c ${available_apple_compilers} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set v [compiler.command_line_tools_version $c]
</span> set vmin [portconfigure::get_min_command_line $c]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${vmin} $v] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend system_compilers $c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$vmin ne "none"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set v [compiler.command_line_tools_version $c]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${vmin} $v] <= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend system_compilers $c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
set clang_compilers ""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vmin [portconfigure::get_min_clang]
</span> foreach c [portconfigure::get_clang_compilers] {
set v [lindex [split $c -] 2]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set vmin [join [lrange [split [portconfigure::get_min_clang] .] 0 1] .]
</span> if {[vercmp ${vmin} $v] <= 0} {
lappend clang_compilers $c
}
}
set gcc_compilers ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach c [portconfigure::get_gcc_compilers] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set v [lindex [split $c -] 2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set vmin [join [lrange [split [portconfigure::get_min_gcc] .] 0 0] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${vmin} $v] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend gcc_compilers $c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vmin [portconfigure::get_min_gcc]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$vmin ne "none"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach c [portconfigure::get_gcc_compilers] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set v [lindex [split $c -] 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${vmin} $v] <= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend gcc_compilers $c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
set compilers ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1064,7 +1068,7 @@ proc portconfigure::get_compiler_fallback {} {
</span> set mpi_compilers ""
foreach mpi [option compiler.mpi] {
foreach c ${compilers} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend mpi_compilers {*}[portconfigure::get_mpi_wrapper $mpi $c]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend mpi_compilers [portconfigure::get_mpi_wrapper $mpi $c]
</span> }
}
return $mpi_compilers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1073,9 +1077,9 @@ proc portconfigure::get_compiler_fallback {} {
</span> #
proc portconfigure::get_fortran_fallback {} {
set compilers ""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vmin [portconfigure::get_min_gfortran]
</span> foreach c [portconfigure::get_gcc_compilers] {
set v [lindex [split $c -] 2]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set vmin [join [lrange [split [portconfigure::get_min_gfortran] .] 0 0] .]
</span> if {[vercmp ${vmin} $v] <= 0} {
lappend compilers $c
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1090,7 +1094,7 @@ proc portconfigure::get_fortran_fallback {} {
</span> set mpi_compilers ""
foreach mpi [option compiler.mpi] {
foreach c ${compilers} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend mpi_compilers {*}[portconfigure::get_mpi_wrapper $mpi $c]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend mpi_compilers [portconfigure::get_mpi_wrapper $mpi $c]
</span> }
}
return $mpi_compilers
</pre><pre style='margin:0'>
</pre>