diff options
Diffstat (limited to 'var')
5 files changed, 9 insertions, 11 deletions
diff --git a/var/spack/repos/builtin.mock/packages/multimethod/package.py b/var/spack/repos/builtin.mock/packages/multimethod/package.py index 8ae2bd1bbe..492ae0853f 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod/package.py @@ -5,7 +5,7 @@ from six import string_types -import spack.architecture +import spack.platforms from spack import * from spack.pkg.builtin.mock.multimethod_base import MultimethodBase @@ -83,7 +83,7 @@ class Multimethod(MultimethodBase): # # Make sure we can switch methods on different target # - platform = spack.architecture.platform() + platform = spack.platforms.host() targets = list(platform.targets.values()) if len(targets) > 1: targets = targets[:-1] diff --git a/var/spack/repos/builtin/packages/arm/package.py b/var/spack/repos/builtin/packages/arm/package.py index c1d149d80f..fcb9530ec9 100644 --- a/var/spack/repos/builtin/packages/arm/package.py +++ b/var/spack/repos/builtin/packages/arm/package.py @@ -43,7 +43,7 @@ _versions = { def get_os(): - spack_os = spack.architecture.platform().default_os + spack_os = spack.platforms.host().default_os return _os_map.get(spack_os, 'RHEL-7') diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 307cd75404..d8772b215e 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -10,7 +10,7 @@ import sys import llnl.util.tty as tty -import spack.architecture +import spack.platforms import spack.util.executable from spack.operating_systems.mac_os import macos_sdk_path, macos_version @@ -324,7 +324,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage): continue # Filter out links in favor of real executables on # all systems but Cray - host_platform = str(spack.architecture.platform()) + host_platform = str(spack.platforms.host()) if os.path.islink(exe) and host_platform != 'cray': continue diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py index 53e24e1c48..7f7948a39e 100644 --- a/var/spack/repos/builtin/packages/sqlite/package.py +++ b/var/spack/repos/builtin/packages/sqlite/package.py @@ -2,12 +2,11 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - import os import re from tempfile import NamedTemporaryFile -from spack import architecture +import spack.platforms class Sqlite(AutotoolsPackage): @@ -168,9 +167,8 @@ class Sqlite(AutotoolsPackage): return find_libraries('libsqlite3', root=self.prefix.lib) def get_arch(self): - arch = architecture.Arch() - arch.platform = architecture.platform() - return str(arch.platform.target('default_target')) + host_platform = spack.platforms.host() + return str(host_platform.target('default_target')) def configure_args(self): args = [] diff --git a/var/spack/repos/builtin/packages/upcxx/package.py b/var/spack/repos/builtin/packages/upcxx/package.py index 5b55de5c2f..2661be4283 100644 --- a/var/spack/repos/builtin/packages/upcxx/package.py +++ b/var/spack/repos/builtin/packages/upcxx/package.py @@ -7,7 +7,7 @@ from spack import * def cross_detect(): - if spack.architecture.platform().name == 'cray': + if spack.platforms.host().name == 'cray': if which('srun'): return 'cray-aries-slurm' if which('aprun'): |