hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed bug in platform names that I introduced yesterday

Browse source
This commit is contained in:
Gregory Becker 2016-03-25 15:41:22 -07:00
parent 315623d361
commit 618a9b2d7b
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/spack/spack/compilers/__init__.py
View file

@ -28,6 +28,7 @@
import imp import imp
import os import os
import platform import platform
import copy
from llnl.util.lang import memoized, list_modules from llnl.util.lang import memoized, list_modules
from llnl.util.filesystem import join_path from llnl.util.filesystem import join_path
@ -77,28 +78,27 @@ def get_compiler_config(arch=None, scope=None):
"""Return the compiler configuration for the specified architecture. """Return the compiler configuration for the specified architecture.
""" """
# Check whether we're on a front-end (native) architecture. # Check whether we're on a front-end (native) architecture.
my_arch = spack.architecture.Arch() my_arch = spack.architecture.Arch()
if isinstance(arch, basestring):
if arch == 'all':
my_arch.platform.name = 'all'
arch = my_arch
if arch is None: if arch is None:
arch = my_arch arch = my_arch
if isinstance(arch, basestring) and arch == 'all':
name = 'all'
else:
name = arch.platform.name
def init_compiler_config(): def init_compiler_config():
"""Compiler search used when Spack has no compilers.""" """Compiler search used when Spack has no compilers."""
config[arch.platform.name] = {} config[name] = {}
compilers = find_compilers(*get_path('PATH')) compilers = find_compilers(*get_path('PATH'))
for compiler in compilers: for compiler in compilers:
config[arch.platform.name].update(_to_dict(compiler)) config[name].update(_to_dict(compiler))
spack.config.update_config('compilers', config, scope=scope) spack.config.update_config('compilers', config, scope=scope)
config = spack.config.get_config('compilers', scope=scope) config = spack.config.get_config('compilers', scope=scope)
# Update the configuration if there are currently no compilers # Update the configuration if there are currently no compilers
# configured. Avoid updating automatically if there ARE site # configured. Avoid updating automatically if there ARE site
# compilers configured but no user ones. # compilers configured but no user ones.
if arch == my_arch and arch not in config: if (isinstance(arch, basestring) or arch == my_arch) and arch not in config:
if scope is None: if scope is None:
# We know no compilers were configured in any scope. # We know no compilers were configured in any scope.
init_compiler_config() init_compiler_config()
@ -109,7 +109,7 @@ def init_compiler_config():
if not site_config: if not site_config:
init_compiler_config() init_compiler_config()
return config[arch.platform.name] if arch.platform.name in config else {} return config[name] if name in config else {}
def add_compilers_to_config(compilers, arch=None, scope=None): def add_compilers_to_config(compilers, arch=None, scope=None):