summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorJohn W. Parent <45471568+johnwparent@users.noreply.github.com>2023-02-02 16:53:16 -0500
committerGitHub <noreply@github.com>2023-02-02 13:53:16 -0800
commit7d50680d9ccd6736d6916c0002e2ca53e2836c40 (patch)
treee6fc60b8c72c204fc1bef13f85804b8cb1315c5d /var
parentdefa4a2340f6231655c51cbae711bc5ebd2d4b45 (diff)
downloadspack-7d50680d9ccd6736d6916c0002e2ca53e2836c40.tar.gz
spack-7d50680d9ccd6736d6916c0002e2ca53e2836c40.tar.bz2
spack-7d50680d9ccd6736d6916c0002e2ca53e2836c40.tar.xz
spack-7d50680d9ccd6736d6916c0002e2ca53e2836c40.zip
zlib package: fix build on Windows (#35103)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/zlib/package.py6
1 files changed, 3 insertions, 3 deletions
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)