diff options
| author | Gregory L. Lee <lee218@llnl.gov> | 2014-03-13 16:02:28 -0700 |
|---|---|---|
| committer | Gregory L. Lee <lee218@llnl.gov> | 2014-03-13 16:02:28 -0700 |
| commit | 09b5239a526ce9f592dbf8eb4e868faf0ac2f5ca (patch) | |
| tree | fbd363d06bf5182b82de3614505d61ef5100a6cf | |
| parent | 0528129e52d70ec64321f532268c0e258d869a8e (diff) | |
| download | spack-09b5239a526ce9f592dbf8eb4e868faf0ac2f5ca.tar.gz spack-09b5239a526ce9f592dbf8eb4e868faf0ac2f5ca.tar.bz2 spack-09b5239a526ce9f592dbf8eb4e868faf0ac2f5ca.tar.xz spack-09b5239a526ce9f592dbf8eb4e868faf0ac2f5ca.zip | |
workarounds for bugs
| -rwxr-xr-x | lib/spack/env/cc | 6 | ||||
| -rw-r--r-- | lib/spack/spack/globals.py | 2 |
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 |