diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2025-08-27 11:57:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2025-08-27 11:57:47 (GMT) |
| commit | 4dce301da47235007ca6fcaf8b773d279f920aa8 (patch) | |
| tree | 68bb948d755a54952ca65fbad89c1289e9c6772a | |
| parent | 5860f82135ef9563e1dd60b1c00daeedb1767c7d (diff) | |
| parent | 9f4d27365595b1a66b01473a9e3d5a23a4e54eea (diff) | |
| download | tcl-4dce301da47235007ca6fcaf8b773d279f920aa8.zip tcl-4dce301da47235007ca6fcaf8b773d279f920aa8.tar.gz tcl-4dce301da47235007ca6fcaf8b773d279f920aa8.tar.bz2 | |
Follow-up to [66cd465323]: For Tcl 9.0+, building on 32-bit MacOS is no longer supported
| -rw-r--r-- | library/platform/platform.tcl | 2 | ||||
| -rw-r--r-- | tests/platform.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl index bd175cd..81a6b15 100644 --- a/library/platform/platform.tcl +++ b/library/platform/platform.tcl @@ -385,7 +385,7 @@ proc ::platform::patterns {id} { if {$cpu ne "arm"} { lappend res macosx${major}.${j}-${cpu} } - if {($cpu eq "x86_64") && ($j == 14)} { + if {($cpu eq "x86_64") && ($j == 14) && ![package vsatisfies [package provide Tcl] 9.0-]} { set alt i386-x86_64 } foreach a $alt { diff --git a/tests/platform.test b/tests/platform.test index 5833a9f..67936f0 100644 --- a/tests/platform.test +++ b/tests/platform.test @@ -99,7 +99,7 @@ test platform-5.0 {format of platform::generic result} -setup { } -result {macos11-arm 1 macos12-arm 1 macos13-arm 1 macos14-arm 1 macos15-arm 1 macos26-arm 1 macos27-arm 1} test platform-5.1 {format of platform::patterns macos26-x86_64} -body { platform::patterns macos26-x86_64 -} -result {macos26-x86_64 macos15-x86_64 macos14-x86_64 macos13-x86_64 macos12-x86_64 macos11-x86_64 macosx10.15-x86_64 macosx10.14-x86_64 macosx10.14-i386-x86_64 macosx10.13-x86_64 macosx10.13-i386-x86_64 macosx10.12-x86_64 macosx10.12-i386-x86_64 macosx10.11-x86_64 macosx10.11-i386-x86_64 macosx10.10-x86_64 macosx10.10-i386-x86_64 macosx10.9-x86_64 macosx10.9-i386-x86_64 tcl} +} -result {macos26-x86_64 macos15-x86_64 macos14-x86_64 macos13-x86_64 macos12-x86_64 macos11-x86_64 macosx10.15-x86_64 macosx10.14-x86_64 macosx10.13-x86_64 macosx10.12-x86_64 macosx10.11-x86_64 macosx10.10-x86_64 macosx10.9-x86_64 tcl} test platform-5.2 {format of platform::patterns macos26-arm} -body { platform::patterns macos26-arm } -result {macos26-arm macos26-x86_64 macos15-arm macos15-x86_64 macos14-arm macos14-x86_64 macos13-arm macos13-x86_64 macos12-arm macos12-x86_64 macos11-arm macos11-x86_64 macosx10.15-x86_64 macosx10.14-x86_64 macosx10.13-x86_64 macosx10.12-x86_64 macosx10.11-x86_64 macosx10.10-x86_64 macosx10.9-x86_64 tcl} |