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

Windows support: correct 64-bit check (#36578)

Browse Source
This commit is contained in:
John W. Parent 2023-04-07 19:50:54 -04:00 committed by GitHub
parent 65ee864232
commit 9d7b79d8e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/7zip/package.py
View File

@ -70,7 +70,7 @@ def plat_arch(self):
return arch return arch
def is_64bit(self): def is_64bit(self):
return "64" in self.pkg.spec.target.family return "64" in str(self.pkg.spec.target.family)
def build(self, spec, prefix): def build(self, spec, prefix):
link_type = "1" if "static" in spec.variants["link_type"].value else "0" link_type = "1" if "static" in spec.variants["link_type"].value else "0"

2
var/spack/repos/builtin/packages/libogg/package.py
View File

@ -39,7 +39,7 @@ class GenericBuilder(GenericBuilder):
phases = ["build", "install"] phases = ["build", "install"]
def is_64bit(self): def is_64bit(self):
return "64" in self.pkg.spec.target.family return "64" in str(self.pkg.spec.target.family)
def build(self, spec, prefix): def build(self, spec, prefix):
if spec.satisfies("%msvc"): if spec.satisfies("%msvc"):

2
var/spack/repos/builtin/packages/libtheora/package.py
View File

@ -69,7 +69,7 @@ def autoreconf(self, pkg, spec, prefix):
class MSBuildBuilder(MSBuildBuilder): class MSBuildBuilder(MSBuildBuilder):
def is_64bit(self): def is_64bit(self):
return "64" in self.pkg.spec.target.family return "64" in str(self.pkg.spec.target.family)
def setup_build_environment(self, env): def setup_build_environment(self, env):
spec = self.pkg.spec spec = self.pkg.spec

2
var/spack/repos/builtin/packages/msmpi/package.py
View File

@ -57,7 +57,7 @@ def setup_build_environment(self, env):
env.set("SPACK_IFORT", ifort_root) env.set("SPACK_IFORT", ifort_root)
def is_64bit(self): def is_64bit(self):
return "64" in self.pkg.spec.target.family return "64" in str(self.pkg.spec.target.family)
def build_command_line(self): def build_command_line(self):
args = ["-noLogo"] args = ["-noLogo"]

2
var/spack/repos/builtin/packages/perl/package.py
View File

@ -230,7 +230,7 @@ def nmake_arguments(self):
return args return args
def is_64bit(self): def is_64bit(self):
return "64" in self.pkg.spec.target.family return "64" in str(self.pkg.spec.target.family)
def configure_args(self): def configure_args(self):
spec = self.spec spec = self.spec

2
var/spack/repos/builtin/packages/xz/package.py
View File

@ -97,7 +97,7 @@ def get_file_string_number(f):
return os.path.join(win_dir, newest_compiler) return os.path.join(win_dir, newest_compiler)
def is_64bit(self): def is_64bit(self):
return "64" in self.pkg.spec.target.family return "64" in str(self.pkg.spec.target.family)
def msbuild_args(self): def msbuild_args(self):
plat = "x64" if self.is_64bit() else "x86" plat = "x64" if self.is_64bit() else "x86"