From 7d50680d9ccd6736d6916c0002e2ca53e2836c40 Mon Sep 17 00:00:00 2001 From: "John W. Parent" <45471568+johnwparent@users.noreply.github.com> Date: Thu, 2 Feb 2023 16:53:16 -0500 Subject: zlib package: fix build on Windows (#35103) --- var/spack/repos/builtin/packages/zlib/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py index 6f533d126b..16341ecbaf 100644 --- a/var/spack/repos/builtin/packages/zlib/package.py +++ b/var/spack/repos/builtin/packages/zlib/package.py @@ -116,9 +116,9 @@ class MakefileBuilder(spack.build_systems.makefile.MakefileBuilder, SetupEnviron class GenericBuilder(spack.build_systems.generic.GenericBuilder, SetupEnvironment): - def install(self, spec, prefix): + def install(self, pkg, spec, prefix): nmake("-f" "win32\\Makefile.msc") - build_dir = self.pkg.stage.source_path + build_dir = pkg.stage.source_path install_tree = { "bin": glob.glob(os.path.join(build_dir, "*.dll")), "lib": glob.glob(os.path.join(build_dir, "*.lib")), @@ -138,4 +138,4 @@ class GenericBuilder(spack.build_systems.generic.GenericBuilder, SetupEnvironmen for file in tree[inst_dir]: install(file, install_dst) - installtree(self.prefix, install_tree) + installtree(prefix, install_tree) -- cgit v1.2.3-70-g09d2