diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-11 12:44:03 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-11 12:44:03 (GMT) |
| commit | 4f95cb4de40e7ae56bd9ee89e9fddf0f4484e956 (patch) | |
| tree | 885eb367bf55b1d8e2e928396aa4707de448d5e3 | |
| parent | 7b3afa79ed7eca6bf1ee6fd63934cf8f2653ebf0 (diff) | |
| parent | 0045179f39d4849f5272d2993a6eb0f2ce7ec4cf (diff) | |
| download | tcl-4f95cb4de40e7ae56bd9ee89e9fddf0f4484e956.zip tcl-4f95cb4de40e7ae56bd9ee89e9fddf0f4484e956.tar.gz tcl-4f95cb4de40e7ae56bd9ee89e9fddf0f4484e956.tar.bz2 | |
Merge 8.6
| -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 } |