summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory L. Lee <lee218@llnl.gov>2014-03-13 16:02:28 -0700
committerGregory L. Lee <lee218@llnl.gov>2014-03-14 08:42:08 -0700
commitf1f5a5a0bf19e72ef7e4de33f0952bd5d384683a (patch)
tree7e2631a96d9b1542a461d340ab3325765c65a34e
parent940dd829dac14b233e9bfc55985eca6dd419edeb (diff)
downloadspack-f1f5a5a0bf19e72ef7e4de33f0952bd5d384683a.tar.gz
spack-f1f5a5a0bf19e72ef7e4de33f0952bd5d384683a.tar.bz2
spack-f1f5a5a0bf19e72ef7e4de33f0952bd5d384683a.tar.xz
spack-f1f5a5a0bf19e72ef7e4de33f0952bd5d384683a.zip
workarounds for bugs
-rwxr-xr-xlib/spack/env/cc6
-rw-r--r--lib/spack/spack/globals.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index 0245e06531..a258bdb49d 100755
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -29,6 +29,11 @@ spack_env_path = get_path("SPACK_ENV_PATH")
# Figure out what type of operation we're doing
command = os.path.basename(sys.argv[0])
cpp, cc, ccld, ld = range(4)
+
+# TODO: this can to be removed once Jira issue SPACK-16 is resolved
+if command == 'CC':
+ command = 'c++'
+
if command == 'cpp':
mode = cpp
elif command == 'ld':
@@ -90,6 +95,7 @@ for item in ['.'] + spack_env_path:
os.environ["PATH"] = ":".join(clean_path)
full_command = [command] + arguments
+
if spack_debug:
input_log = os.path.join(spack_build_root, 'spack_cc_in.log')
output_log = os.path.join(spack_build_root, 'spack_cc_out.log')
diff --git a/lib/spack/spack/globals.py b/lib/spack/spack/globals.py
index 8e8f32ba04..6ff1a69304 100644
--- a/lib/spack/spack/globals.py
+++ b/lib/spack/spack/globals.py
@@ -70,7 +70,7 @@ editor = Executable(os.environ.get("EDITOR", ""))
# Curl tool for fetching files.
curl = which("curl", required=True)
-curl.add_default_arg("-k") # TODO not good
+curl.add_default_arg("-k") # TODO: remove me in favor of spack -k`
# Whether to build in tmp space or directly in the stage_path.
# If this is true, then spack will make stage directories in