From 0b1c0bdd6e34172d7beb75387e561815de518074 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sat, 28 Mar 2020 08:11:37 -0600 Subject: xsbench: fix build of v19 (#15715) * xsbench: fix build of v19 * Flake8 --- var/spack/repos/builtin/packages/xsbench/package.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/xsbench/package.py b/var/spack/repos/builtin/packages/xsbench/package.py index 3648edc298..b6040714d4 100644 --- a/var/spack/repos/builtin/packages/xsbench/package.py +++ b/var/spack/repos/builtin/packages/xsbench/package.py @@ -28,7 +28,12 @@ class Xsbench(MakefilePackage): depends_on('mpi', when='+mpi') - build_directory = 'src' + @property + def build_directory(self): + if self.spec.satisfies('@:18'): + return 'src' + else: + return 'openmp-threading' @property def build_targets(self): @@ -50,4 +55,5 @@ class Xsbench(MakefilePackage): def install(self, spec, prefix): mkdir(prefix.bin) - install('src/XSBench', prefix.bin) + with working_dir(self.build_directory): + install('XSBench', prefix.bin) -- cgit v1.2.3-70-g09d2