Changeset 55933


Ignore:
Timestamp:
Aug 21, 2009, 3:29:12 PM (11 years ago)
Author:
jmr@…
Message:

in proc platform, set the variant using the actual name that was just defined

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/port1.0/portutil.tcl

    r55825 r55933  
    697697
    698698    # Set the variant if this platform matches the platform we're on
    699     set matches 1
    700     if {[info exists os.platform] && ${os.platform} == $os} {
    701         set sel_platform $os
    702         if {[info exists os.major] && [info exists release]} {
    703             if {${os.major} == $release } {
    704                 set sel_platform ${sel_platform}_${release}
    705             } else {
    706                 set matches 0
    707             }
    708         }
    709         if {$matches == 1 && [info exists arch] && [info exists os.arch]} {
    710             if {${os.arch} == $arch} {
    711                 set sel_platform ${sel_platform}_${arch}
    712             } else {
    713                 set matches 0
    714             }
    715         }
    716         if {$matches == 1} {
    717             variant_set $sel_platform
    718         }
     699    if {([info exists os.platform] && ${os.platform} == $os)
     700            && !([info exists os.major] && [info exists release] && ${os.major} != $release)
     701            && !([info exists arch] && [info exists os.arch] && ${os.arch} != $arch)} {
     702        variant_set $platform
    719703    }
    720704}
Note: See TracChangeset for help on using the changeset viewer.