From 2e9da47a2df49a0c78545ee563592c495d4e19f8 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 28 Apr 2022 07:09:40 -0700 Subject: Ascent/Conduit: re-add fortran compiler that was mistakenly removed (#30351) --- var/spack/repos/builtin/packages/ascent/package.py | 3 +++ var/spack/repos/builtin/packages/conduit/package.py | 2 ++ 2 files changed, 5 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index 78f70baf2e..593c0f2596 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -303,6 +303,7 @@ class Ascent(CMakePackage, CudaPackage): ####################### c_compiler = env["SPACK_CC"] cpp_compiler = env["SPACK_CXX"] + f_compiler = env["SPACK_FC"] ####################################################################### # Directly fetch the names of the actual compilers to create a @@ -354,6 +355,8 @@ class Ascent(CMakePackage, CudaPackage): cfg.write("# fortran compiler used by spack\n") if "+fortran" in spec: cfg.write(cmake_cache_entry("ENABLE_FORTRAN", "ON")) + cfg.write(cmake_cache_entry("CMAKE_Fortran_COMPILER", + f_compiler)) else: cfg.write(cmake_cache_entry("ENABLE_FORTRAN", "OFF")) diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index b4a8d52a64..dc824b8c92 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -337,6 +337,8 @@ class Conduit(CMakePackage): cfg.write("# fortran compiler used by spack\n") if "+fortran" in spec: cfg.write(cmake_cache_entry("ENABLE_FORTRAN", "ON")) + cfg.write(cmake_cache_entry("CMAKE_Fortran_COMPILER", + f_compiler)) else: cfg.write(cmake_cache_entry("ENABLE_FORTRAN", "OFF")) -- cgit v1.2.3-60-g2f50