diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2021-07-02 02:29:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-02 09:29:17 +0200 |
| commit | f1842f363db1e159e7b11fabde88acbb15563695 (patch) | |
| tree | 33182dd45944453e0fe19354da90568f4169c52a | |
| parent | 7ced07a14150e34f86ed1152bbca029efa0552e1 (diff) | |
| download | spack-f1842f363db1e159e7b11fabde88acbb15563695.tar.gz spack-f1842f363db1e159e7b11fabde88acbb15563695.tar.bz2 spack-f1842f363db1e159e7b11fabde88acbb15563695.tar.xz spack-f1842f363db1e159e7b11fabde88acbb15563695.zip | |
dataspaces: move compiler vars to setup_build_environment (#24626)
| -rw-r--r-- | var/spack/repos/builtin/packages/dataspaces/package.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/dataspaces/package.py b/var/spack/repos/builtin/packages/dataspaces/package.py index 9c85b6b804..845a86324e 100644 --- a/var/spack/repos/builtin/packages/dataspaces/package.py +++ b/var/spack/repos/builtin/packages/dataspaces/package.py @@ -3,9 +3,10 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack import * import six +from spack import * + def is_string(x): """validate a string""" @@ -52,11 +53,20 @@ class Dataspaces(AutotoolsPackage): bash = which('bash') bash('./autogen.sh') + def setup_build_environment(self, env): + if self.spec.satisfies('+mpi'): + env.set('CC', self.spec['mpi'].mpicc) + env.set('FC', self.spec['mpi'].mpifc) + + env.set('CFLAGS', self.compiler.cc_pic_flag) + + if '%gcc@10:' in self.spec: + env.set('FCFLAGS', '-fallow-argument-mismatch') + def configure_args(self): args = [] cookie = self.spec.variants['gni-cookie'].value ptag = self.spec.variants['ptag'].value - args.append('CFLAGS={0}'.format(self.compiler.cc_pic_flag)) if self.spec.satisfies('+dimes'): args.append('--enable-dimes') if self.spec.satisfies('+cray-drc'): @@ -64,7 +74,4 @@ class Dataspaces(AutotoolsPackage): else: args.append('--with-gni-cookie=%s' % cookie) args.append('--with-gni-ptag=%s' % ptag) - if self.spec.satisfies('+mpi'): - args.append('CC=%s' % self.spec['mpi'].mpicc) - args.append('FC=%s' % self.spec['mpi'].mpifc) return args |