Changeset 68781


Ignore:
Timestamp:
Jun 13, 2010, 2:26:15 PM (10 years ago)
Author:
jmr@…
Message:

merge r68764 from trunk:

fix possibility of duplicates in configure.universal_archs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/release_1_9/base/src/port1.0/portconfigure.tcl

    r67269 r68781  
    227227    foreach arch $archs {
    228228        if {[lsearch -exact $supported_archs $arch] != -1} {
    229             lappend ret $arch
    230         } elseif {$arch == "x86_64" && [lsearch -exact $supported_archs "i386"] != -1 && [lsearch -exact $ret "i386"] == -1} {
    231             lappend ret "i386"
    232         } elseif {$arch == "ppc64" && [lsearch -exact $supported_archs "ppc"] != -1 && [lsearch -exact $ret "ppc"] == -1} {
    233             lappend ret "ppc"
     229            set add_arch $arch
     230        } elseif {$arch == "x86_64" && [lsearch -exact $supported_archs "i386"] != -1} {
     231            set add_arch "i386"
     232        } elseif {$arch == "ppc64" && [lsearch -exact $supported_archs "ppc"] != -1} {
     233            set add_arch "ppc"
     234        } else {
     235            continue
     236        }
     237        if {[lsearch -exact $ret $add_arch] == -1} {
     238            lappend ret $add_arch
    234239        }
    235240    }
Note: See TracChangeset for help on using the changeset viewer.