From 41046499c69150a7a81518f2ffba3405de0d6577 Mon Sep 17 00:00:00 2001
From: Gregory Becker <becker33@llnl.gov>
Date: Fri, 8 Jan 2016 18:51:38 -0800
Subject: minor bug chasing

---
 lib/spack/env/cc                      | 16 ----------------
 lib/spack/spack/compilers/__init__.py |  4 ++--
 lib/spack/spack/concretize.py         |  4 ++--
 3 files changed, 4 insertions(+), 20 deletions(-)

(limited to 'lib')

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
@@ -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.
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')
-- 
cgit v1.2.3-70-g09d2