From 9d7b79d8e13acb3827da44d22fb1aec275527ac1 Mon Sep 17 00:00:00 2001
From: "John W. Parent" <45471568+johnwparent@users.noreply.github.com>
Date: Fri, 7 Apr 2023 19:50:54 -0400
Subject: Windows support: correct 64-bit check (#36578)

---
 var/spack/repos/builtin/packages/7zip/package.py      | 2 +-
 var/spack/repos/builtin/packages/libogg/package.py    | 2 +-
 var/spack/repos/builtin/packages/libtheora/package.py | 2 +-
 var/spack/repos/builtin/packages/msmpi/package.py     | 2 +-
 var/spack/repos/builtin/packages/perl/package.py      | 2 +-
 var/spack/repos/builtin/packages/xz/package.py        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/7zip/package.py b/var/spack/repos/builtin/packages/7zip/package.py
index c33c0f2112..2e9d09bbb9 100644
--- a/var/spack/repos/builtin/packages/7zip/package.py
+++ b/var/spack/repos/builtin/packages/7zip/package.py
@@ -70,7 +70,7 @@ class _7zip(SourceforgePackage, Package):
         return arch
 
     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):
         link_type = "1" if "static" in spec.variants["link_type"].value else "0"
diff --git a/var/spack/repos/builtin/packages/libogg/package.py b/var/spack/repos/builtin/packages/libogg/package.py
index c82794e9ba..ef736b8ff7 100644
--- a/var/spack/repos/builtin/packages/libogg/package.py
+++ b/var/spack/repos/builtin/packages/libogg/package.py
@@ -39,7 +39,7 @@ class GenericBuilder(GenericBuilder):
     phases = ["build", "install"]
 
     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):
         if spec.satisfies("%msvc"):
diff --git a/var/spack/repos/builtin/packages/libtheora/package.py b/var/spack/repos/builtin/packages/libtheora/package.py
index 5d3f181272..fb45785b83 100644
--- a/var/spack/repos/builtin/packages/libtheora/package.py
+++ b/var/spack/repos/builtin/packages/libtheora/package.py
@@ -69,7 +69,7 @@ class AutotoolsBuilder(AutotoolsBuilder):
 
 class MSBuildBuilder(MSBuildBuilder):
     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):
         spec = self.pkg.spec
diff --git a/var/spack/repos/builtin/packages/msmpi/package.py b/var/spack/repos/builtin/packages/msmpi/package.py
index 32adcb4aa3..50306c164f 100644
--- a/var/spack/repos/builtin/packages/msmpi/package.py
+++ b/var/spack/repos/builtin/packages/msmpi/package.py
@@ -57,7 +57,7 @@ class GenericBuilder(GenericBuilder):
         env.set("SPACK_IFORT", ifort_root)
 
     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):
         args = ["-noLogo"]
diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py
index c054fb3ef7..40b31e1237 100644
--- a/var/spack/repos/builtin/packages/perl/package.py
+++ b/var/spack/repos/builtin/packages/perl/package.py
@@ -230,7 +230,7 @@ class Perl(Package):  # Perl doesn't use Autotools, it should subclass Package
         return args
 
     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):
         spec = self.spec
diff --git a/var/spack/repos/builtin/packages/xz/package.py b/var/spack/repos/builtin/packages/xz/package.py
index 49edb42497..560604a781 100644
--- a/var/spack/repos/builtin/packages/xz/package.py
+++ b/var/spack/repos/builtin/packages/xz/package.py
@@ -97,7 +97,7 @@ class MSBuildBuilder(MSBuildBuilder):
         return os.path.join(win_dir, newest_compiler)
 
     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):
         plat = "x64" if self.is_64bit() else "x86"
-- 
cgit v1.2.3-60-g2f50