Ignore:
Timestamp:
Jul 12, 2014, 6:11:12 AM (5 years ago)
Author:
sean@…
Message:

compilers-1.0: only add conflicts for variants that exist; fixes #44144

File:
1 edited

Legend:

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

    r121951 r121974  
    202202            }
    203203
     204            # only add conflicts from the compiler database (set above) if we
     205            # actually have the compiler in the list of allowed variants
     206            foreach j $cdb($variant,conflict) {
     207                if {[lsearch -exact $j ${compilers.variants}] > -1} {
     208                    lappend c $j
     209                }
     210            }
     211
    204212            # for each compiler, set the value if not empty; we can't use
    205213            # configure.compiler because of dragonegg and possibly other new
     
    223231                variant ${variant} description \
    224232                    {Build using the $cdb($variant,descrip) compiler} \
    225                     conflicts $c $cdb($variant,conflict) {
     233                    conflicts $c {
    226234
    227235                    depends_build-append   $cdb($variant,depends)
Note: See TracChangeset for help on using the changeset viewer.