diff options
| author | Christoph Junghans <christoph.junghans@gmail.com> | 2017-10-14 05:55:02 -0600 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2017-10-14 13:55:02 +0200 |
| commit | a6853726368aec948d45b9d4b6fecc28df3f763f (patch) | |
| tree | a3327001f49dc94cb89115c930e8122859de2a6f | |
| parent | 6f9036c8587c13b9ddd70befdda961c5db6ca23f (diff) | |
| download | spack-a6853726368aec948d45b9d4b6fecc28df3f763f.tar.gz spack-a6853726368aec948d45b9d4b6fecc28df3f763f.tar.bz2 spack-a6853726368aec948d45b9d4b6fecc28df3f763f.tar.xz spack-a6853726368aec948d45b9d4b6fecc28df3f763f.zip | |
Revert "Use cflags instead of the args variable (#5756)" (#5765)
This reverts commit 6c3184820aa1052016d92f7ff0419b8085d8ad14.
| -rw-r--r-- | var/spack/repos/builtin/packages/m4/package.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py index 267b9c3784..2523745e58 100644 --- a/var/spack/repos/builtin/packages/m4/package.py +++ b/var/spack/repos/builtin/packages/m4/package.py @@ -48,13 +48,11 @@ class M4(AutotoolsPackage): spec = self.spec args = ['--enable-c++'] - # CFLAGS handling - cflags = copy.deepcopy(optflags[self.spec.compiler.name]) if spec.satisfies('%clang') and not spec.satisfies('platform=darwin'): - cflags.append('-rtlib=compiler-rt') + args.append('CFLAGS=-rtlib=compiler-rt') + if spec.satisfies('%intel'): - cflags.append('-no-gcc') - args.append('CFLAGS = {0}'.format(' '.join(cflags))) + args.append('CFLAGS=-no-gcc') if '+sigsegv' in spec: args.append('--with-libsigsegv-prefix={0}'.format( |