From cd9cdd641062c5e4254feccd2f358cf8c7bbef01 Mon Sep 17 00:00:00 2001
From: Denis Davydov <davydden@gmail.com>
Date: Tue, 10 May 2016 13:37:57 +0200
Subject: [PATCH] astyle: compile with spack_cxx
---
var/spack/repos/builtin/packages/astyle/package.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py
index 5274fc018f..c8e8c3cbec 100644
--- a/var/spack/repos/builtin/packages/astyle/package.py
+++ b/var/spack/repos/builtin/packages/astyle/package.py
@@ -11,8 +11,13 @@ class Astyle(Package):
def install(self, spec, prefix):
with working_dir('src'):
+ # unfortunately 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' % spack_cxx, make_file)
+
make('-f',
- join_path(self.stage.source_path,'build','clang','Makefile'),
+ make_file,
parallel=False)
+
mkdirp(self.prefix.bin)
install(join_path(self.stage.source_path, 'src','bin','astyle'), self.prefix.bin)
--
GitLab