diff options
| author | dgp <dgp@users.sourceforge.net> | 2020-12-11 13:35:39 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2020-12-11 13:35:39 (GMT) |
| commit | 54a058adf123ac3df89dd30cd18864df3a7f978a (patch) | |
| tree | 67c6a3b006c3f1b97b11fde174dbca6aaaa4064f /library | |
| parent | 0ad74ce9cd065ae9e334c9051e443930a6fa9933 (diff) | |
| parent | cb1ad01c7d82b96987730abde249e0957e986972 (diff) | |
| download | tcl-54a058adf123ac3df89dd30cd18864df3a7f978a.zip tcl-54a058adf123ac3df89dd30cd18864df3a7f978a.tar.gz tcl-54a058adf123ac3df89dd30cd18864df3a7f978a.tar.bz2 | |
merge 8.6
Diffstat (limited to 'library')
| -rw-r--r-- | library/platform/platform.tcl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl index 2e54a33..6c01142 100644 --- a/library/platform/platform.tcl +++ b/library/platform/platform.tcl @@ -343,7 +343,14 @@ proc ::platform::patterns {id} { lappend alt universal } x86_64 { - lappend alt i386-x86_64 + if {[lindex [split $::tcl_platform(osVersion) .] 0] < 19} { + set alt i386-x86_64 + } else { + set alt {} + } + } + arm { + lappend alt x86_64 } default { set alt {} } } @@ -365,7 +372,9 @@ proc ::platform::patterns {id} { } # Add 10.5 to 10.minor to patterns. for {set j $minor} {$j >= 5} {incr j -1} { - lappend res macosx${major}.${j}-${cpu} + if {$cpu ne "arm"} { + lappend res macosx${major}.${j}-${cpu} + } foreach a $alt { lappend res macosx${major}.${j}-$a } |