minor bug chasing

This commit is contained in:
Gregory Becker 2016-01-08 18:51:38 -08:00
parent 6e5238d037
commit 41046499c6
3 changed files with 4 additions and 20 deletions

16
lib/spack/env/cc vendored
View File

@ -71,22 +71,6 @@ for param in $parameters; do
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.

View File

@ -259,8 +259,8 @@ def __init__(self):
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):

View File

@ -220,14 +220,14 @@ def concretize_target(self, spec):
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')