summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-05-18 08:35:01 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2016-05-18 08:35:01 -0700
commit637da63506b3fd747fef25c9be0a09823e717f88 (patch)
tree7d9a4734edfe1de29d659542222cd67d6270b23b /var
parentaf7785727b547f1bb1998abdbe705dd4c1dae373 (diff)
parent67999d1b1cf58a46543975320c36fb42cd39e9b5 (diff)
downloadspack-637da63506b3fd747fef25c9be0a09823e717f88.tar.gz
spack-637da63506b3fd747fef25c9be0a09823e717f88.tar.bz2
spack-637da63506b3fd747fef25c9be0a09823e717f88.tar.xz
spack-637da63506b3fd747fef25c9be0a09823e717f88.zip
Merge pull request #948 from davydden/bugfix/astyle
astyle: fix filter command which failed on OSX with python 2.7.10
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/astyle/package.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py
index cd6f1d04f1..815c184577 100644
--- a/var/spack/repos/builtin/packages/astyle/package.py
+++ b/var/spack/repos/builtin/packages/astyle/package.py
@@ -41,7 +41,7 @@ class Astyle(Package):
# we need to edit the makefile in place to set compiler:
make_file = join_path(self.stage.source_path,
'build', 'gcc', 'Makefile')
- filter_file(r'^CXX\s*=.*', 'CXX=%s'.format(spack_cxx), make_file)
+ filter_file(r'^CXX\s*=.*', 'CXX=%s' % spack_cxx, make_file)
make('-f',
make_file,