zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zlib package: fix build on Windows (#35103)

Browse Source
This commit is contained in:
John W. Parent 2023-02-02 16:53:16 -05:00 committed by GitHub
parent defa4a2340
commit 7d50680d9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/zlib/package.py
View File

@ -116,9 +116,9 @@ def edit(self, pkg, spec, prefix):
class GenericBuilder(spack.build_systems.generic.GenericBuilder, SetupEnvironment): class GenericBuilder(spack.build_systems.generic.GenericBuilder, SetupEnvironment):
def install(self, spec, prefix): def install(self, pkg, spec, prefix):
nmake("-f" "win32\\Makefile.msc") nmake("-f" "win32\\Makefile.msc")
build_dir = self.pkg.stage.source_path build_dir = pkg.stage.source_path
install_tree = { install_tree = {
"bin": glob.glob(os.path.join(build_dir, "*.dll")), "bin": glob.glob(os.path.join(build_dir, "*.dll")),
"lib": glob.glob(os.path.join(build_dir, "*.lib")), "lib": glob.glob(os.path.join(build_dir, "*.lib")),
@ -138,4 +138,4 @@ def installtree(dst, tree):
for file in tree[inst_dir]: for file in tree[inst_dir]:
install(file, install_dst) install(file, install_dst)
installtree(self.prefix, install_tree) installtree(prefix, install_tree)