Ignore:
Timestamp:
Jun 10, 2015, 12:34:41 AM (4 years ago)
Author:
dstrubbe@…
Message:

compilers portgroup:

  • Bugfix: +llvm was unnecessarily conflicting with +g95 and +gfortran.
  • Fixing description for +g95 so the word 'compiler' is not repeated.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/_resources/port1.0/group/compilers-1.0.tcl

    r136118 r137348  
    140140set cdb(llvm,f90)      ""
    141141
    142 # and lastly we add a gfortran and g95 variant for use with clang*; note that
     142# and lastly we add a gfortran and g95 variant for use with clang* and llvm; note that
    143143# we don't need gfortran when we are in an "only-fortran" mode
    144144set compilers.gfortran_equiv    gcc49
     
    161161set cdb(g95,variant)  g95
    162162set cdb(g95,compiler) g95
    163 set cdb(g95,descrip)  "Fortran compiler from g95"
     163set cdb(g95,descrip)  "g95 Fortran"
    164164set cdb(g95,depends)  port:g95
    165165set cdb(g95,dependsl) ""
     
    200200            set c [lreplace ${compilers.variants} $i $i]
    201201
    202             # fortran doesn't conflict with clang
     202            # Fortran compilers do not conflict with C compilers.
     203            # thus, llvm and clang do not conflict with g95 and gfortran
    203204            if {$variant eq "gfortran" || $variant eq "g95"} {
    204                 foreach clangcomp ${compilers.clang_variants} {
     205                foreach clangcomp [concat ${compilers.clang_variants} {llvm}] {
    205206                    set i [lsearch -exact $c $clangcomp]
    206207                    set c [lreplace $c $i $i]
    207208                }
    208             } elseif {[string match clang* $variant]} {
     209            } elseif {[string match clang* $variant] || $variant == "llvm"} {
    209210                set i [lsearch -exact $c gfortran]
    210211                set c [lreplace $c $i $i]
Note: See TracChangeset for help on using the changeset viewer.