summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Melara <maamelara@gmail.com>2016-06-20 10:57:58 -0700
committerMario Melara <maamelara@gmail.com>2016-06-20 10:57:58 -0700
commit1303b5a6a9e83a572c5a02ddfde1c2353ca60d41 (patch)
treef05f13946cd7b327b7ab92f52b8c11da85adeb0b
parentfe301135021a9f64069a9bf2e3a074c8d4b712ef (diff)
downloadspack-1303b5a6a9e83a572c5a02ddfde1c2353ca60d41.tar.gz
spack-1303b5a6a9e83a572c5a02ddfde1c2353ca60d41.tar.bz2
spack-1303b5a6a9e83a572c5a02ddfde1c2353ca60d41.tar.xz
spack-1303b5a6a9e83a572c5a02ddfde1c2353ca60d41.zip
Adding more init_config as args to all_compilers,all_compilers_config, and get_compiler_config
-rw-r--r--lib/spack/spack/compilers/__init__.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py
index ae72b743b2..c4b41394e0 100644
--- a/lib/spack/spack/compilers/__init__.py
+++ b/lib/spack/spack/compilers/__init__.py
@@ -83,7 +83,7 @@ def _to_dict(compiler):
return {'compiler': d}
-def get_compiler_config(scope=None):
+def get_compiler_config(scope=None, init_config=True):
"""Return the compiler configuration for the specified architecture.
"""
def init_compiler_config():
@@ -98,7 +98,7 @@ def get_compiler_config(scope=None):
# Update the configuration if there are currently no compilers
# configured. Avoid updating automatically if there ARE site
# compilers configured but no user ones.
- if not config:
+ if not config and init_config:
if scope is None:
# We know no compilers were configured in any scope.
init_compiler_config()
@@ -153,23 +153,23 @@ def remove_compiler_from_config(compiler_spec, scope=None):
spack.config.update_config('compilers', filtered_compiler_config, scope)
-def all_compilers_config(scope=None):
+def all_compilers_config(scope=None, init_config=True):
"""Return a set of specs for all the compiler versions currently
available to build with. These are instances of CompilerSpec.
"""
# Get compilers for this architecture.
global _cache_config_file #Create a cache of the config file so we don't load all the time.
if not _cache_config_file:
- _cache_config_file = get_compiler_config(scope)
+ _cache_config_file = get_compiler_config(scope, init_config)
return _cache_config_file
else:
return _cache_config_file
-def all_compilers(scope=None):
+def all_compilers(scope=None, init_config=True):
# Return compiler specs from the merged config.
return [spack.spec.CompilerSpec(s['compiler']['spec'])
- for s in all_compilers_config(scope)]
+ for s in all_compilers_config(scope, init_config)]
def default_compiler():