diff options
| author | andreask <andreask> | 2014-08-01 19:50:11 (GMT) |
|---|---|---|
| committer | andreask <andreask> | 2014-08-01 19:50:11 (GMT) |
| commit | 2a7d494c84c347710e0d9784a7cd62031baf9b8f (patch) | |
| tree | cbddf4e81b4806c79e0c071715c22da57f51d541 /library/platform/platform.tcl | |
| parent | 1078c19b40369fb07d6aeb23f32f72326e46fa18 (diff) | |
| parent | 5a669c8fbb45b3321f07482c114152486d0600bf (diff) | |
| download | tcl-2a7d494c84c347710e0d9784a7cd62031baf9b8f.zip tcl-2a7d494c84c347710e0d9784a7cd62031baf9b8f.tar.gz tcl-2a7d494c84c347710e0d9784a7cd62031baf9b8f.tar.bz2 | |
Updated package "platform" to version 1.0.13. Separated the
identifiers "macosx*-i386-x86_64" and "macosx-universal" as
incompatible with each other.
Diffstat (limited to 'library/platform/platform.tcl')
| -rw-r--r-- | library/platform/platform.tcl | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl index 5698425..1bce7b5 100644 --- a/library/platform/platform.tcl +++ b/library/platform/platform.tcl @@ -313,13 +313,25 @@ proc ::platform::patterns {id} { } } } + macosx-powerpc { + lappend res macosx-universal + } + macosx-x86_64 { + lappend res macosx-i386-x86_64 + } + macosx-ix86 { + lappend res macosx-universal macosx-i386-x86_64 + } macosx*-* { # 10.5+ if {[regexp {macosx([^-]*)-(.*)} $id -> v cpu]} { switch -exact -- $cpu { - ix86 - - x86_64 { set alt i386-x86_64 } + ix86 { + lappend alt i386-x86_64 + lappend alt universal + } + x86_64 { lappend alt i386-x86_64 } default { set alt {} } } @@ -330,35 +342,26 @@ proc ::platform::patterns {id} { set res {} for {set j $minor} {$j >= 5} {incr j -1} { lappend res macosx${major}.${j}-${cpu} - lappend res macosx${major}.${j}-universal - if {$alt ne {}} { - lappend res macosx${major}.${j}-$alt + foreach a $alt { + lappend res macosx${major}.${j}-$a } } # Add unversioned patterns for 10.3/10.4 builds. lappend res macosx-${cpu} - lappend res macosx-universal - if {$alt ne {}} { - lappend res macosx-$alt + foreach a $alt { + lappend res macosx-$a } } else { - lappend res macosx-universal - if {$alt ne {}} { - lappend res macosx-$alt + # No version, just do unversioned patterns. + foreach a $alt { + lappend res macosx-$a } } } else { - lappend res macosx-universal + # no v, no cpu ... nothing } } - macosx-powerpc { - lappend res macosx-universal - } - macosx-x86_64 - - macosx-ix86 { - lappend res macosx-universal macosx-i386-x86_64 - } } lappend res tcl ; # Pure tcl packages are always compatible. return $res @@ -368,7 +371,7 @@ proc ::platform::patterns {id} { # ### ### ### ######### ######### ######### ## Ready -package provide platform 1.0.12 +package provide platform 1.0.13 # ### ### ### ######### ######### ######### ## Demo application |