From a2d57f055025b09442c8dade727904111791eeb7 Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Wed, 19 Jul 2017 19:50:10 -0500 Subject: [PATCH] Fix more flake issues caused by last changes. --- var/spack/repos/builtin/packages/cbtf/package.py | 1 + var/spack/repos/builtin/packages/openspeedshop/package.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 46f5715d14e..68e2b7d0a22 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -42,6 +42,7 @@ from spack import * + class Cbtf(CMakePackage): """CBTF project contains the base code for CBTF that supports creating components, component networks and the support to connect these diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 620c2d1295b..2acb44ad02b 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -173,9 +173,9 @@ def cmake_args(self): self.set_defaultbase_cmakeOptions(spec, cmake_args) cmake_args.extend( - ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, - '-DCMAKE_C_FLAGS=%s' % compile_flags, - '-DINSTRUMENTOR=%s' + ['-DCMAKE_CXX_FLAGS=%s' % compile_flags, + '-DCMAKE_C_FLAGS=%s' % compile_flags, + '-DINSTRUMENTOR=%s' % instrumentor_setting, '-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix,