summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Pavel <rspavel@lanl.gov>2020-07-29 19:03:12 -0600
committerGitHub <noreply@github.com>2020-07-29 20:03:12 -0500
commitaf778aac0a0439241eabf91a4eb1af3b3f1570cc (patch)
treeaad0fdc59ad4395eb74f3a6f57355f8f57697637
parent5a5f2c00a8e7bce94f12da3fbcb05658ecff3c20 (diff)
downloadspack-af778aac0a0439241eabf91a4eb1af3b3f1570cc.tar.gz
spack-af778aac0a0439241eabf91a4eb1af3b3f1570cc.tar.bz2
spack-af778aac0a0439241eabf91a4eb1af3b3f1570cc.tar.xz
spack-af778aac0a0439241eabf91a4eb1af3b3f1570cc.zip
Tweak to EOSPAC for gcc@10 Support (#17777)
Eospac's build breaks on gcc@10: due to dependence on -fcommon behavior and gnu changing to -fno-common. Added conditional argument to support bleeding edge compilers
-rw-r--r--var/spack/repos/builtin/packages/eospac/package.py17
1 files changed, 11 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/eospac/package.py b/var/spack/repos/builtin/packages/eospac/package.py
index 0d9221e7df..34f2e00632 100644
--- a/var/spack/repos/builtin/packages/eospac/package.py
+++ b/var/spack/repos/builtin/packages/eospac/package.py
@@ -33,17 +33,22 @@ class Eospac(Package):
def install(self, spec, prefix):
with working_dir('Source'):
+ compilerArgs = []
+ compilerArgs.append('CC={0}'.format(spack_cc))
+ compilerArgs.append('CXX={0}'.format(spack_cxx))
+ compilerArgs.append('F77={0}'.format(spack_f77))
+ compilerArgs.append('F90={0}'.format(spack_fc))
+ # Eospac depends on fcommon behavior
+ # but gcc@10 flipped to default fno-common
+ if "%gcc@10:" in spec:
+ compilerArgs.append('CFLAGS=-fcommon')
make('install',
- 'CC={0}'.format(spack_cc),
- 'CXX={0}'.format(spack_cxx),
- 'F77={0}'.format(spack_f77),
- 'F90={0}'.format(spack_fc),
'prefix={0}'.format(prefix),
'INSTALLED_LIBRARY_DIR={0}'.format(prefix.lib),
'INSTALLED_INCLUDE_DIR={0}'.format(prefix.include),
'INSTALLED_EXAMPLE_DIR={0}'.format(prefix.example),
- 'INSTALLED_BIN_DIR={0}'.format(prefix.bin))
-
+ 'INSTALLED_BIN_DIR={0}'.format(prefix.bin),
+ *compilerArgs)
# fix conflict with linux's getopt for 6.4.0beta.2
if spec.satisfies('@6.4.0beta.2'):
with working_dir(prefix.bin):