From d8eb2e947e1d6031835746072e88e134b9585fff Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 3 Mar 2021 23:59:50 +0000 Subject: (platform_name): check for darwin $os_major == 10. git-svn-id: svn://tug.org/texlive/trunk@58101 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index aa8202dca88..e8c75391db4 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -363,7 +363,7 @@ sub platform_name { if ($os_major >= 11 || $os_minor >= $mactex_darwin) { $CPU = "universal"; $OS = "darwin"; - } elsif ($os_major <= 10 && $os_minor >= 6 && $os_minor < $mactex_darwin) { + } elsif ($os_major == 10 && $6 <= $os_minor && $os_minor < $mactex_darwin){ # in between, x86 hardware only. On 10.6 only, must check if 64-bit, # since if later than that, always 64-bit. my $is64 = $os_minor == 6 @@ -424,7 +424,7 @@ sub platform_desc { 'powerpc-linux' => 'GNU/Linux on PowerPC', 'sparc-linux' => 'GNU/Linux on Sparc', 'sparc-solaris' => 'Solaris on Sparc', - 'universal-darwin' => 'MacOSX current (10.13-) on ARM/x86_64', + 'universal-darwin' => 'MacOSX current (10.14-) on ARM/x86_64', 'win32' => 'Windows', 'x86_64-cygwin' => 'Cygwin on x86_64', 'x86_64-darwinlegacy' => 'MacOSX legacy (10.6-) on x86_64', -- cgit v1.2.3