From b490d65f28e2f746bb93746ff854afd299881cdd Mon Sep 17 00:00:00 2001 From: Martin Aumüller Date: Mon, 23 Nov 2020 08:37:40 +0100 Subject: recognize macOS 11.1 as big sur (#20038) Big Sur versions go 11.0, 11.0.1, 11.1 (vs. prior versions that only used the minor component) Co-authored-by: Todd Gamblin --- lib/spack/spack/operating_systems/mac_os.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/operating_systems/mac_os.py b/lib/spack/spack/operating_systems/mac_os.py index d59e6fce65..0efc298338 100644 --- a/lib/spack/spack/operating_systems/mac_os.py +++ b/lib/spack/spack/operating_systems/mac_os.py @@ -55,10 +55,14 @@ class MacOs(OperatingSystem): '10.14': 'mojave', '10.15': 'catalina', '10.16': 'bigsur', - '11.0': 'bigsur', + '11': 'bigsur', } - mac_ver = str(macos_version().up_to(2)) + # Big Sur versions go 11.0, 11.0.1, 11.1 (vs. prior versions that + # only used the minor component) + part = 1 if macos_version() >= Version('11') else 2 + + mac_ver = str(macos_version().up_to(part)) name = mac_releases.get(mac_ver, "macos") super(MacOs, self).__init__(name, mac_ver) -- cgit v1.2.3-60-g2f50