From 41b35a783e27650428261467f1d53675df2d8f72 Mon Sep 17 00:00:00 2001 From: Abhinav Bhatele Date: Wed, 26 Sep 2018 18:47:51 -0700 Subject: fix build errors, make mpi variant default and add openmp variant (#9364) --- var/spack/repos/builtin/packages/xsbench/package.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/xsbench/package.py b/var/spack/repos/builtin/packages/xsbench/package.py index b46c828ba0..ebad0f683e 100644 --- a/var/spack/repos/builtin/packages/xsbench/package.py +++ b/var/spack/repos/builtin/packages/xsbench/package.py @@ -41,7 +41,8 @@ class Xsbench(MakefilePackage): version('14', '94d5d28eb031fd4ef35507c9c1862169') version('13', '72a92232d2f5777fb52f5ea4082aff37') - variant('mpi', default=False, description='Build with MPI support') + variant('mpi', default=True, description='Build with MPI support') + variant('openmp', default=True, description='Build with OpenMP support') depends_on('mpi', when='+mpi') @@ -55,8 +56,11 @@ class Xsbench(MakefilePackage): cflags = '-std=gnu99' if '+mpi' in self.spec: targets.append('CC={0}'.format(self.spec['mpi'].mpicc)) + else: + targets.append('CC={0}'.format(self.compiler.cxx)) - cflags += ' ' + self.compiler.openmp_flag + if '+openmp' in self.spec: + cflags += ' ' + self.compiler.openmp_flag targets.append('CFLAGS={0}'.format(cflags)) targets.append('LDFLAGS=-lm') -- cgit v1.2.3-70-g09d2