diff options
| author | Zach van Rijn <me@zv.io> | 2022-11-14 05:38:29 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-11-14 05:38:29 +0000 |
| commit | 473ac780f15a7836df1c6f89a9a538174c252e9f (patch) | |
| tree | 30ed49ba8a1fbc0beb31884bcf87d80c1b4dd227 /user/spack/archspec-fix-cpu-family-detection.patch | |
| parent | f528883c7e836e9b8bb08f1dbbefc3faf3b0d8cf (diff) | |
| download | packages-473ac780f15a7836df1c6f89a9a538174c252e9f.tar.gz packages-473ac780f15a7836df1c6f89a9a538174c252e9f.tar.bz2 packages-473ac780f15a7836df1c6f89a9a538174c252e9f.tar.xz packages-473ac780f15a7836df1c6f89a9a538174c252e9f.zip | |
user/spack: bump { 0.17.2 --> 0.19.0_p1 }.
Diffstat (limited to 'user/spack/archspec-fix-cpu-family-detection.patch')
| -rw-r--r-- | user/spack/archspec-fix-cpu-family-detection.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/user/spack/archspec-fix-cpu-family-detection.patch b/user/spack/archspec-fix-cpu-family-detection.patch new file mode 100644 index 000000000..a3979ec95 --- /dev/null +++ b/user/spack/archspec-fix-cpu-family-detection.patch @@ -0,0 +1,16 @@ +See also: https://github.com/archspec/archspec/issues/102 + +diff --git a/lib/spack/external/archspec/cpu/detect.py b/lib/spack/external/archspec/cpu/detect.py +index a7cc4481f6..cadd593ca2 100644 +--- a/lib/spack/external/archspec/cpu/detect.py ++++ b/lib/spack/external/archspec/cpu/detect.py +@@ -92,7 +92,8 @@ def _machine(): + + # If we are not on Darwin, trust what Python tells us + if operating_system != "Darwin": +- return platform.machine() ++ machine = platform.machine() ++ return TARGETS[machine].family.name if machine in TARGETS else machine + + # On Darwin it might happen that we are on M1, but using an interpreter + # built for x86_64. In that case "platform.machine() == 'x86_64'", so we |