diff options
| author | Gregory Becker <becker33@llnl.gov> | 2016-01-08 18:51:38 -0800 |
|---|---|---|
| committer | Gregory Becker <becker33@llnl.gov> | 2016-01-08 18:51:38 -0800 |
| commit | 41046499c69150a7a81518f2ffba3405de0d6577 (patch) | |
| tree | 86a7d9cbc0a4c7530a1c97731a68a667dff9b394 /lib | |
| parent | 6e5238d037aebe4e610a16f200d860cee1a1355d (diff) | |
| download | spack-41046499c69150a7a81518f2ffba3405de0d6577.tar.gz spack-41046499c69150a7a81518f2ffba3405de0d6577.tar.bz2 spack-41046499c69150a7a81518f2ffba3405de0d6577.tar.xz spack-41046499c69150a7a81518f2ffba3405de0d6577.zip | |
minor bug chasing
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/spack/env/cc | 16 | ||||
| -rw-r--r-- | lib/spack/spack/compilers/__init__.py | 4 | ||||
| -rw-r--r-- | lib/spack/spack/concretize.py | 4 |
3 files changed, 4 insertions, 20 deletions
diff --git a/lib/spack/env/cc b/lib/spack/env/cc index b6c6e03e42..1704ae3280 100755 --- a/lib/spack/env/cc +++ b/lib/spack/env/cc @@ -72,22 +72,6 @@ done # -# Cray module environment-related stuff. -# -if [ ! -z "$SPACK_CRAYPE" ]; then - cur_pe=$(module list 2>&1 | grep PrgEnv | grep -o 'PrgEnv-[^/]*') - if [ ! -z "$cur_pe" ]; then - module swap $cur_pe $SPACK_CRAYPE - else - module load $SPACK_CRAYPE - fi -fi - -if [ ! -z "$SPACK_COMP_MODULE" ]; then - module load $SPACK_COMP_MODULE -fi - -# # Figure out the type of compiler, the language, and the mode so that # the compiler script knows what to do. # diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py index 3a0a88b5e3..e38ef949d7 100644 --- a/lib/spack/spack/compilers/__init__.py +++ b/lib/spack/spack/compilers/__init__.py @@ -259,8 +259,8 @@ class NoCompilersError(spack.error.SpackError): class NoCompilerForSpecError(spack.error.SpackError): def __init__(self, compiler_spec, target): - super(NoCompilerForSpecError, self).__init__("No compilers for target %s satisfy spec %s", - compiler_spec, target) + super(NoCompilerForSpecError, self).__init__("No compilers for target %s satisfy spec %s" % ( + target, compiler_spec)) class CompilerSpecInsufficientlySpecificError(spack.error.SpackError): def __init__(self, compiler_spec): diff --git a/lib/spack/spack/concretize.py b/lib/spack/spack/concretize.py index 43637ed468..b8057cd46c 100644 --- a/lib/spack/spack/concretize.py +++ b/lib/spack/spack/concretize.py @@ -220,14 +220,14 @@ class DefaultConcretizer(object): if isinstance(spec.target,spack.architecture.Target): return False else: - spec.add_target_from_string(spec, spec.target) + spec.add_target_from_string(spec.target) return True #changed if spec.root.target: if isinstance(spec.root.target,spack.architecture.Target): spec.target = spec.root.target else: - spec.add_target_from_string(spec, spec.root.target) + spec.add_target_from_string(spec.root.target) else: platform = spack.architecture.sys_type() spec.target = platform.target('default') |