Ignore:
Timestamp:
Jan 23, 2014, 8:09:12 PM (5 years ago)
Author:
sean@…
Message:

compilers-1.0: also check default_variants in *_variant_isset

File:
1 edited

Legend:

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

    r116307 r116308  
    280280
    281281foreach variant ${compilers.gcc_variants} {
    282     if {[variant_isset $variant]} {
     282    # we need to check the default_variants so we can't use variant_isset
     283    if {[info exists variations($variant)] && $variations($variant) eq "+"} {
    283284        depends_lib-delete      port:g95
    284285        break
     
    329330
    330331proc fortran_variant_name {} {
    331     global compilers.fortran_variants
     332    global compilers.fortran_variants variations
    332333
    333334    foreach fc ${compilers.fortran_variants} {
    334         if {[variant_isset $fc]} {
     335        # we need to check the default_variants so we can't use variant_isset
     336        if {[info exists variations($fc)] && $variations($fc) eq "+"} {
    335337            return $fc
    336338        }
     
    341343
    342344proc clang_variant_name {} {
    343     global compilers.clang_variants compilers.dragonegg_variants
     345    global compilers.clang_variants compilers.dragonegg_variants variations
    344346
    345347    foreach c ${compilers.clang_variants} {
    346         if {[variant_isset $c]} {
     348        # we need to check the default_variants so we can't use variant_isset
     349        if {[info exists variations($c)] && $variations($c) eq "+"} {
    347350            return $c
    348351        }
     
    350353
    351354    foreach c ${compilers.dragonegg_variants} {
    352         if {[variant_isset $c]} {
     355        # we need to check the default_variants so we can't use variant_isset
     356        if {[info exists variations($c)] && $variations($c) eq "+"} {
    353357            return $c
    354358        }
Note: See TracChangeset for help on using the changeset viewer.