From 1b7cf171ce555f3dd5f032f7bd6661f5620a8e43 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 20 Apr 2023 15:11:56 +0200 Subject: Use core API to create a Makefile during bootstrapping (#37023) --- lib/spack/spack/bootstrap/environment.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/bootstrap/environment.py b/lib/spack/spack/bootstrap/environment.py index 32753e9520..36bbc0d260 100644 --- a/lib/spack/spack/bootstrap/environment.py +++ b/lib/spack/spack/bootstrap/environment.py @@ -19,6 +19,7 @@ import spack.build_environment import spack.environment import spack.tengine import spack.util.executable +from spack.environment import depfile from ._common import _root_spec from .config import root_path, spec_for_current_python, store_path @@ -121,15 +122,12 @@ class BootstrapEnvironment(spack.environment.Environment): ) def _install_with_depfile(self) -> None: - spackcmd = spack.util.executable.which("spack") - spackcmd( - "-e", - str(self.environment_root()), - "env", - "depfile", - "-o", - str(self.environment_root().joinpath("Makefile")), + model = depfile.MakefileModel.from_env(self) + template = spack.tengine.make_environment().get_template( + os.path.join("depfile", "Makefile") ) + makefile = self.environment_root() / "Makefile" + makefile.write_text(template.render(model.to_dict())) make = spack.util.executable.which("make") kwargs = {} if not tty.is_debug(): -- cgit v1.2.3-60-g2f50