Merge branch 'version_opt' into spindle
This commit is contained in:
commit
6147d52f2d
1 changed files with 4 additions and 1 deletions
5
lib/spack/env/cc
vendored
5
lib/spack/env/cc
vendored
|
@ -28,7 +28,7 @@ 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, version_check = range(5)
|
||||||
if command == 'cpp':
|
if command == 'cpp':
|
||||||
mode = cpp
|
mode = cpp
|
||||||
elif command == 'ld':
|
elif command == 'ld':
|
||||||
|
@ -40,6 +40,9 @@ elif '-c' in sys.argv:
|
||||||
else:
|
else:
|
||||||
mode = ccld
|
mode = ccld
|
||||||
|
|
||||||
|
if '-V' in sys.argv or '-v' in sys.argv or '--version' in sys.argv:
|
||||||
|
mode = version_check
|
||||||
|
|
||||||
# Parse out the includes, libs, etc. so we can adjust them if need be.
|
# Parse out the includes, libs, etc. so we can adjust them if need be.
|
||||||
parser = argparse.ArgumentParser(add_help=False)
|
parser = argparse.ArgumentParser(add_help=False)
|
||||||
parser.add_argument("-I", action='append', default=[], dest='include_path')
|
parser.add_argument("-I", action='append', default=[], dest='include_path')
|
||||||
|
|
Loading…
Reference in a new issue