From f1bdbefd465a3691bb1f08761ba4ac925e10efce Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Mon, 14 Mar 2022 16:33:56 +0100 Subject: mpich: fix the detection of the package (#29284) --- lib/spack/spack/compilers/gcc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/compilers/gcc.py b/lib/spack/spack/compilers/gcc.py index 4c49c0d636..abbce721e8 100644 --- a/lib/spack/spack/compilers/gcc.py +++ b/lib/spack/spack/compilers/gcc.py @@ -23,10 +23,10 @@ class Gcc(spack.compiler.Compiler): # Subclasses use possible names of Fortran 90 compiler fc_names = ['gfortran'] - # MacPorts builds gcc versions with prefixes and -mp-X.Y suffixes. + # MacPorts builds gcc versions with prefixes and -mp-X or -mp-X.Y suffixes. # Homebrew and Linuxbrew may build gcc with -X, -X.Y suffixes. # Old compatibility versions may contain XY suffixes. - suffixes = [r'-mp-\d+\.\d+', r'-\d+\.\d+', r'-\d+', r'\d\d'] + suffixes = [r'-mp-\d+(?:\.\d+)?', r'-\d+(?:\.\d+)?', r'\d\d'] # Named wrapper links within build_env_path link_paths = {'cc': 'gcc/gcc', -- cgit v1.2.3-70-g09d2