diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-11-14 15:23:23 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-11-14 15:23:23 -0500 |
| commit | ac2c7967f69e3ffd29a1ed04a15838073dc060de (patch) | |
| tree | d24dc27dcb11414775d2971b645ef4a6fbb922d9 /SConstruct | |
| parent | bc4d15ddd199420d2201fd0e8bde399e51ea0d3d (diff) | |
| parent | 2f6a9454d13e44faba55b14d958f20a04bc36246 (diff) | |
| download | gem5-ac2c7967f69e3ffd29a1ed04a15838073dc060de.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem/
into zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops
--HG--
extra : convert_revision : 966246877ac1f1e6c2675d413b0b405cccfecbeb
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index d3428e894..d8851f091 100644 --- a/SConstruct +++ b/SConstruct @@ -175,6 +175,14 @@ env = Environment(ENV = os.environ, # inherit user's environment vars ROOT = ROOT, SRCDIR = SRCDIR) +#Parse CC/CXX early so that we use the correct compiler for +# to test for dependencies/versions/libraries/includes +if ARGUMENTS.get('CC', None): + env['CC'] = ARGUMENTS.get('CC') + +if ARGUMENTS.get('CXX', None): + env['CXX'] = ARGUMENTS.get('CXX') + env.SConsignFile(os.path.join(build_root,"sconsign")) # Default duplicate option is to use hard links, but this messes up |