diff --git a/var/spack/repos/builtin/packages/globalarrays/package.py b/var/spack/repos/builtin/packages/globalarrays/package.py index 89b42c48fe3..75289ace181 100644 --- a/var/spack/repos/builtin/packages/globalarrays/package.py +++ b/var/spack/repos/builtin/packages/globalarrays/package.py @@ -35,9 +35,9 @@ class Globalarrays(AutotoolsPackage): version("5.6", sha256="a228dfbae9a6cfaae34694d7e56f589ac758e959b58f4bc49e6ef44058096767") depends_on("c", type="build") # generated - depends_on("cxx", type="build") # generated depends_on("fortran", type="build") # generated + variant("cxx", default=False, description="Enable C++") variant("scalapack", default=False, description="Enable SCALAPACK") variant( "armci", @@ -53,6 +53,7 @@ class Globalarrays(AutotoolsPackage): depends_on("libfabric", when="armci=ofi") depends_on("rdma-core", when="armci=openib") + depends_on("cxx", type="build", when="+cxx") depends_on("scalapack", when="+scalapack") # See release https://github.com/GlobalArrays/ga/releases/tag/v5.7.1 @@ -74,6 +75,9 @@ def configure_args(self): "--with-lapack={0}".format(lapack_libs), ] + if self.spec.satisfies("+cxx"): + args.append("--enable-cxx") + if self.spec.satisfies("+scalapack"): scalapack_libs = self.spec["scalapack"].libs.ld_flags args.append("--with-scalapack={0}".format(scalapack_libs))