diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2019-10-12 20:21:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-12 20:21:45 -0500 |
| commit | ea4f9ebbde50ae3606a6d8955512bc1b54299c51 (patch) | |
| tree | f51114fdb4f776436ab0087acf6844d9db86c2e8 | |
| parent | 08d448bc54e92f587899fcb68f7ebeb975119797 (diff) | |
| download | spack-ea4f9ebbde50ae3606a6d8955512bc1b54299c51.tar.gz spack-ea4f9ebbde50ae3606a6d8955512bc1b54299c51.tar.bz2 spack-ea4f9ebbde50ae3606a6d8955512bc1b54299c51.tar.xz spack-ea4f9ebbde50ae3606a6d8955512bc1b54299c51.zip | |
gmp: fix make check on catalina (#13201)
| -rw-r--r-- | var/spack/repos/builtin/packages/gmp/package.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/gmp/package.py b/var/spack/repos/builtin/packages/gmp/package.py index 8d829e5d30..5e333f8b22 100644 --- a/var/spack/repos/builtin/packages/gmp/package.py +++ b/var/spack/repos/builtin/packages/gmp/package.py @@ -30,10 +30,15 @@ class Gmp(AutotoolsPackage): # shared library support. Regenerating it fixes the issue. force_autoreconf = True - def configure_args(self): - args = ['--enable-cxx'] + def flag_handler(self, name, flags): + # Work around macOS Catalina / Xcode 11 code generation bug + # (test failure t-toom53, due to wrong code in mpn/toom53_mul.o) + if self.spec.satisfies('os=catalina') and name == 'cflags': + flags.append('-fno-stack-check') # This flag is necessary for the Intel build to pass `make check` - if self.spec.compiler.name == 'intel': - args.append('CXXFLAGS=-no-ftz') + elif self.spec.satisfies('%intel') and name == 'cxxflags': + flags.append('-no-ftz') + return (flags, None, None) - return args + def configure_args(self): + return ['--enable-cxx'] |