hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

workarounds for bugs

Browse source
This commit is contained in:
Gregory L. Lee 2014-03-13 16:02:28 -07:00
parent 940dd829da
commit f1f5a5a0bf
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/spack/env/cc vendored
View file

@ -29,6 +29,11 @@ spack_env_path = get_path("SPACK_ENV_PATH")
# Figure out what type of operation we're doing # Figure out what type of operation we're doing
command = os.path.basename(sys.argv[0]) command = os.path.basename(sys.argv[0])
cpp, cc, ccld, ld = range(4) 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': if command == 'cpp':
mode = cpp mode = cpp
elif command == 'ld': elif command == 'ld':
@ -90,6 +95,7 @@ for item in ['.'] + spack_env_path:
os.environ["PATH"] = ":".join(clean_path) os.environ["PATH"] = ":".join(clean_path)
full_command = [command] + arguments full_command = [command] + arguments
if spack_debug: if spack_debug:
input_log = os.path.join(spack_build_root, 'spack_cc_in.log') input_log = os.path.join(spack_build_root, 'spack_cc_in.log')
output_log = os.path.join(spack_build_root, 'spack_cc_out.log') output_log = os.path.join(spack_build_root, 'spack_cc_out.log')

2
lib/spack/spack/globals.py
View file

@ -70,7 +70,7 @@
# Curl tool for fetching files. # Curl tool for fetching files.
curl = which("curl", required=True) 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. # Whether to build in tmp space or directly in the stage_path.
# If this is true, then spack will make stage directories in # If this is true, then spack will make stage directories in