summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMartin Aumüller <aumuell@reserv.at>2020-11-23 08:37:40 +0100
committerTamara Dahlgren <dahlgren1@llnl.gov>2021-02-17 17:07:15 -0800
commit508534aad93179df69842ce55c0dd1fa38335b1f (patch)
treef732d243b896770cd65b14337d44cac874da23b7 /lib
parentcda34ba20a7cbd9c7706d9b098f513d4ec4957d4 (diff)
downloadspack-508534aad93179df69842ce55c0dd1fa38335b1f.tar.gz
spack-508534aad93179df69842ce55c0dd1fa38335b1f.tar.bz2
spack-508534aad93179df69842ce55c0dd1fa38335b1f.tar.xz
spack-508534aad93179df69842ce55c0dd1fa38335b1f.zip
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 <tgamblin@llnl.gov>
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/operating_systems/mac_os.py8
1 files changed, 6 insertions, 2 deletions
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)