diff options
| author | Tom Payerle <payerle@umd.edu> | 2020-10-12 15:13:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 14:13:11 -0500 |
| commit | 7c12ca1d83c49a3543a150fcf8276be66c84169f (patch) | |
| tree | f4d6de346368c1be2b93a35d446c19a38a6bc21d /var | |
| parent | 7a562d40454f597521f053a20f50c046acf20838 (diff) | |
| download | spack-7c12ca1d83c49a3543a150fcf8276be66c84169f.tar.gz spack-7c12ca1d83c49a3543a150fcf8276be66c84169f.tar.bz2 spack-7c12ca1d83c49a3543a150fcf8276be66c84169f.tar.xz spack-7c12ca1d83c49a3543a150fcf8276be66c84169f.zip | |
m4: Fix issue compiling with new intel compilers (#18894) (#19273)
Original version added --no-gcc to CFLAGS when compiling with intel
compilers. This does not appear to be needed and indeed causes problems
(see #18894) with newer intel compilers; I have modified so it is not
added for intel@19: (I confirmed it is needed/works for intel@20, based
on comments in #18854 looks like holds for intel@19 as well).
(Also fix old formatting issue flake8 was complaining about)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/m4/package.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py index 5ce6bfd0cc..a08db18627 100644 --- a/var/spack/repos/builtin/packages/m4/package.py +++ b/var/spack/repos/builtin/packages/m4/package.py @@ -60,7 +60,7 @@ class M4(AutotoolsPackage, GNUMirrorPackage): if spec.satisfies('%fj') and not spec.satisfies('platform=darwin'): args.append('LDFLAGS=-rtlib=compiler-rt') - if spec.satisfies('%intel'): + if spec.satisfies('%intel@:18.999'): args.append('CFLAGS=-no-gcc') if '+sigsegv' in spec: @@ -72,7 +72,7 @@ class M4(AutotoolsPackage, GNUMirrorPackage): # http://lists.gnu.org/archive/html/bug-m4/2016-09/msg00002.html arch = spec.architecture if (arch.platform == 'darwin' and arch.os == 'sierra' and - '%gcc' in spec): + '%gcc' in spec): args.append('ac_cv_type_struct_sched_param=yes') return args |