hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ascent/Conduit: re-add fortran compiler that was mistakenly removed (#30351)

Browse source
This commit is contained in:
Chris White 2022-04-28 07:09:40 -07:00 committed by GitHub
parent 3e863848f8
commit 2e9da47a2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
var/spack/repos/builtin/packages/ascent/package.py
View file

@ -303,6 +303,7 @@ def hostconfig(self):
####################### #######################
c_compiler = env["SPACK_CC"] c_compiler = env["SPACK_CC"]
cpp_compiler = env["SPACK_CXX"] cpp_compiler = env["SPACK_CXX"]
f_compiler = env["SPACK_FC"]
####################################################################### #######################################################################
# Directly fetch the names of the actual compilers to create a # Directly fetch the names of the actual compilers to create a
@ -354,6 +355,8 @@ def hostconfig(self):
cfg.write("# fortran compiler used by spack\n") cfg.write("# fortran compiler used by spack\n")
if "+fortran" in spec: if "+fortran" in spec:
cfg.write(cmake_cache_entry("ENABLE_FORTRAN", "ON")) cfg.write(cmake_cache_entry("ENABLE_FORTRAN", "ON"))
cfg.write(cmake_cache_entry("CMAKE_Fortran_COMPILER",
f_compiler))
else: else:
cfg.write(cmake_cache_entry("ENABLE_FORTRAN", "OFF")) cfg.write(cmake_cache_entry("ENABLE_FORTRAN", "OFF"))

2
var/spack/repos/builtin/packages/conduit/package.py
View file

@ -337,6 +337,8 @@ def hostconfig(self):
cfg.write("# fortran compiler used by spack\n") cfg.write("# fortran compiler used by spack\n")
if "+fortran" in spec: if "+fortran" in spec:
cfg.write(cmake_cache_entry("ENABLE_FORTRAN", "ON")) cfg.write(cmake_cache_entry("ENABLE_FORTRAN", "ON"))
cfg.write(cmake_cache_entry("CMAKE_Fortran_COMPILER",
f_compiler))
else: else:
cfg.write(cmake_cache_entry("ENABLE_FORTRAN", "OFF")) cfg.write(cmake_cache_entry("ENABLE_FORTRAN", "OFF"))