diff options
Diffstat (limited to 'lib/spack/env/cc')
| -rwxr-xr-x | lib/spack/env/cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/spack/env/cc b/lib/spack/env/cc index 47a5bcf900..0711c873e3 100755 --- a/lib/spack/env/cc +++ b/lib/spack/env/cc @@ -18,7 +18,7 @@ if not spack_lib: # Grab a minimal set of spack packages sys.path.append(spack_lib) from spack.compilation import * -import spack.tty as tty +import llnl.util.tty as tty spack_prefix = get_env_var("SPACK_PREFIX") spack_build_root = get_env_var("SPACK_BUILD_ROOT") @@ -28,7 +28,16 @@ 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, version_check = range(5) + +######################################################################## +# 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': @@ -93,6 +102,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') |