From 25c1ef1e576df930b275684b3c2a1b672df41338 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Mon, 3 Oct 2022 11:05:21 -0700 Subject: Tidied up configure arguments to use special spack autotools features. (#32930) --- var/spack/repos/builtin/packages/aws-ofi-rccl/package.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py b/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py index b08f384b77..7bb7b409b5 100644 --- a/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py +++ b/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py @@ -21,8 +21,8 @@ class AwsOfiRccl(AutotoolsPackage): version("cxi", branch="cxi", default=True) version("master", branch="master") - variant("enable-trace", default=False, description="Enable printing trace messages") - variant("disable-tests", default=False, description="Disable build of tests") + variant("trace", default=False, description="Enable printing trace messages") + variant("tests", default=False, description="Build tests") depends_on("libfabric") depends_on("hip") @@ -46,6 +46,8 @@ class AwsOfiRccl(AutotoolsPackage): spec = self.spec args = [] + # Always set configure's external paths to use the Spack + # provided dependencies args.extend( [ "--with-libfabric={0}".format(spec["libfabric"].prefix), @@ -55,10 +57,7 @@ class AwsOfiRccl(AutotoolsPackage): ] ) - if "+enable-trace" in self.spec: - args.append("--enable-trace") - - if "+disable-tests" in self.spec: - args.append("--disable-tests") + args.extend(self.enable_or_disable("trace")) + args.extend(self.enable_or_disable("tests")) return args -- cgit v1.2.3-60-g2f50