From a6853726368aec948d45b9d4b6fecc28df3f763f Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sat, 14 Oct 2017 05:55:02 -0600 Subject: [PATCH] Revert "Use cflags instead of the args variable (#5756)" (#5765) This reverts commit 6c3184820aa1052016d92f7ff0419b8085d8ad14. --- var/spack/repos/builtin/packages/m4/package.py | 8 +++----- 1 file 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 267b9c3784a..2523745e58a 100644 --- a/var/spack/repos/builtin/packages/m4/package.py +++ b/var/spack/repos/builtin/packages/m4/package.py @@ -48,13 +48,11 @@ def configure_args(self): 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(