diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2025-08-22 12:50:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2025-08-22 12:50:28 (GMT) |
| commit | 65b29252affc1999b4c72236b728b848e7a732f5 (patch) | |
| tree | 2a9c40255b25a983dbf3890a4c110a61c59edd03 | |
| parent | 4ee7135c5a85552878d7f4f21786d0b17d5bad77 (diff) | |
| download | tcl-65b29252affc1999b4c72236b728b848e7a732f5.zip tcl-65b29252affc1999b4c72236b728b848e7a732f5.tar.gz tcl-65b29252affc1999b4c72236b728b848e7a732f5.tar.bz2 | |
Fix handling of i386-x86_64
| -rw-r--r-- | library/platform/platform.tcl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl index d188a5e..97bf815 100644 --- a/library/platform/platform.tcl +++ b/library/platform/platform.tcl @@ -348,13 +348,14 @@ proc ::platform::patterns {id} { # 10.5+,11.0+ if {[regexp {macosx?([^-]*)-(.*)} $id -> v cpu]} { + foreach {major minor} [split $v.15 .] break switch -exact -- $cpu { ix86 { lappend alt i386-x86_64 lappend alt universal } x86_64 { - if {[lindex [split $::tcl_platform(osVersion) .] 0] < 19} { + if {$major < 11 && $minor < 15} { set alt i386-x86_64 } else { set alt {} @@ -367,7 +368,6 @@ proc ::platform::patterns {id} { } if {$v ne ""} { - foreach {major minor} [split $v.15 .] break set res {} while {$major > 10} { # Add $major to patterns. @@ -385,6 +385,9 @@ proc ::platform::patterns {id} { if {$cpu ne "arm"} { lappend res macosx${major}.${j}-${cpu} } + if {($cpu eq "x86_64") && ($j == 14)} { + set alt i386-x86_64 + } foreach a $alt { lappend res macosx${major}.${j}-$a } |