diff options
| author | Denis Davydov <davydden@gmail.com> | 2016-11-11 06:52:22 +0100 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-11-10 21:52:22 -0800 |
| commit | 7cb756cdbb332b9ffb80c7d930b4711860915f93 (patch) | |
| tree | c58c0d78737725fb858266ea5b07576b0b72d396 /var | |
| parent | 26ed2327ae128cb613b0af2c039c9efe2ce1558d (diff) | |
| download | spack-7cb756cdbb332b9ffb80c7d930b4711860915f93.tar.gz spack-7cb756cdbb332b9ffb80c7d930b4711860915f93.tar.bz2 spack-7cb756cdbb332b9ffb80c7d930b4711860915f93.tar.xz spack-7cb756cdbb332b9ffb80c7d930b4711860915f93.zip | |
tree: use Spack's compiler and fix installation on macOS (#2293)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/tree/package.py | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/tree/package.py b/var/spack/repos/builtin/packages/tree/package.py index 8e0e176c4c..795f8c997e 100644 --- a/var/spack/repos/builtin/packages/tree/package.py +++ b/var/spack/repos/builtin/packages/tree/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import sys class Tree(Package): @@ -39,8 +40,24 @@ class Tree(Package): version('1.7.0', 'abe3e03e469c542d8e157cdd93f4d8a6') def install(self, spec, prefix): - filter_file(r'^prefix =.*', 'prefix = %s' % prefix, 'Makefile') - filter_file(r'^CFLAGS', '# use spack settings instead... CFLAGS', - 'Makefile') - make() - make('install') + objs = [ + 'tree.o', + 'unix.o', + 'html.o', + 'xml.o', + 'json.o', + 'hash.o', + 'color.o' + ] + if (sys.platform == 'darwin'): + objs.append('strverscmp.o') + + args = [ + 'prefix=%s' % prefix, + 'CC=%s' % spack_cc, + 'CFLAGS=', + 'OBJS=%s' % ' '.join(objs), + 'install' + ] + + make(*args) |