From 8d986b8a99a7a451ca4c511050a8341d0e6480cd Mon Sep 17 00:00:00 2001 From: shanedsnyder Date: Fri, 11 Oct 2024 19:30:58 -0500 Subject: darshan-*: ensure proper usage of spack compilers (#45636) --- var/spack/repos/builtin/packages/darshan-runtime/package.py | 5 +---- var/spack/repos/builtin/packages/darshan-util/package.py | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/darshan-runtime/package.py b/var/spack/repos/builtin/packages/darshan-runtime/package.py index b1604ee8ab..81bbd2877e 100644 --- a/var/spack/repos/builtin/packages/darshan-runtime/package.py +++ b/var/spack/repos/builtin/packages/darshan-runtime/package.py @@ -151,10 +151,7 @@ class DarshanRuntime(AutotoolsPackage): extra_args.append("--with-jobid-env=%s" % job_id) extra_args.append("--with-zlib=%s" % spec["zlib-api"].prefix) - if spec.satisfies("+mpi"): - extra_args.append("CC=%s" % self.spec["mpi"].mpicc) - else: - extra_args.append("CC=%s" % self.compiler.cc) + if "+mpi" not in spec: extra_args.append("--without-mpi") return extra_args diff --git a/var/spack/repos/builtin/packages/darshan-util/package.py b/var/spack/repos/builtin/packages/darshan-util/package.py index ca4acb8fb9..8cbe414d76 100644 --- a/var/spack/repos/builtin/packages/darshan-util/package.py +++ b/var/spack/repos/builtin/packages/darshan-util/package.py @@ -82,7 +82,6 @@ class DarshanUtil(AutotoolsPackage): spec = self.spec extra_args = [] - extra_args.append("CC=%s" % self.compiler.cc) extra_args.append("--with-zlib=%s" % spec["zlib-api"].prefix) if spec.satisfies("+apmpi"): if self.version < Version("3.3.2"): -- cgit v1.2.3-70-g09d2