diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index 9de2d4a9a14..32c4a842726 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -376,8 +376,9 @@ def _get_host_config_path(self, spec): # if on llnl systems, we can use the SYS_TYPE if "SYS_TYPE" in env: sys_type = env["SYS_TYPE"] - host_config_path = "{0}-{1}-{2}-ascent-{3}.cmake".format( - socket.gethostname(), sys_type, spec.compiler, spec.dag_hash() + compiler_str = f"{self['c'].name}-{self['c'].version}" + host_config_path = ( + f"{socket.gethostname()}-{sys_type}-{compiler_str}" f"-ascent-{spec.dag_hash()}.cmake" ) dest_dir = spec.prefix host_config_path = os.path.abspath(join_path(dest_dir, host_config_path)) diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 1ab662acdec..e6ea152d033 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -301,10 +301,11 @@ def _get_host_config_path(self, spec): # if on llnl systems, we can use the SYS_TYPE if "SYS_TYPE" in env: sys_type = env["SYS_TYPE"] - host_config_path = "{0}-{1}-{2}-conduit-{3}.cmake".format( - socket.gethostname(), sys_type, spec.compiler, spec.dag_hash() - ) + compiler_str = f"{self['c'].name}-{self['c'].version}" + host_config_path = ( + f"{socket.gethostname()}-{sys_type}-{compiler_str}" f"-conduit-{spec.dag_hash()}.cmake" + ) dest_dir = self.stage.source_path host_config_path = os.path.abspath(join_path(dest_dir, host_config_path)) return host_config_path diff --git a/var/spack/repos/builtin/packages/lvarray/package.py b/var/spack/repos/builtin/packages/lvarray/package.py index 17cbace3b9f..edbe109479d 100644 --- a/var/spack/repos/builtin/packages/lvarray/package.py +++ b/var/spack/repos/builtin/packages/lvarray/package.py @@ -121,12 +121,8 @@ def _get_host_config_path(self, spec): var = "-".join([var, "cuda"]) hostname = socket.gethostname().rstrip("1234567890") - host_config_path = "%s-%s-%s%s.cmake" % ( - hostname, - self._get_sys_type(spec), - spec.compiler, - var, - ) + compiler_str = f"{self['c'].name}-{self['c'].version}" + host_config_path = f"{hostname}-{self._get_sys_type(spec)}-{compiler_str}{var}.cmake" dest_dir = self.stage.source_path host_config_path = os.path.abspath(pjoin(dest_dir, host_config_path)) diff --git a/var/spack/repos/builtin/packages/vtk-h/package.py b/var/spack/repos/builtin/packages/vtk-h/package.py index 4a20bc2c5d4..97a9f46d0db 100644 --- a/var/spack/repos/builtin/packages/vtk-h/package.py +++ b/var/spack/repos/builtin/packages/vtk-h/package.py @@ -112,8 +112,9 @@ def _get_host_config_path(self, spec): # if on llnl systems, we can use the SYS_TYPE if "SYS_TYPE" in env: sys_type = env["SYS_TYPE"] - host_config_path = "{0}-{1}-{2}-vtkh-{3}.cmake".format( - socket.gethostname(), sys_type, spec.compiler, spec.dag_hash() + compiler_str = f"{self['cxx'].name}-{self['cxx'].version}" + host_config_path = ( + f"{socket.gethostname()}-{sys_type}-{compiler_str}-vtkh-{spec.dag_hash()}.cmake" ) dest_dir = spec.prefix host_config_path = os.path.abspath(join_path(dest_dir, host_config_path))