diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-05-30 17:08:12 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-05-30 17:08:12 -0400 |
| commit | 0193476ea790963884059c27d7fdd607a6f79019 (patch) | |
| tree | 88a3fe2434eb3108c57b768652a79cb0c20efe13 /SConstruct | |
| parent | 4e65d2678d0778915688f3b276543c357b4618ed (diff) | |
| download | gem5-0193476ea790963884059c27d7fdd607a6f79019.tar.xz | |
Fix compiling on Solaris since Nate's libelf change
SConstruct:
export env after we've set CC/CXX
ext/libelf/SConscript:
pull in the CC/CXX variables from env. Use gm4 if it exists
ext/libelf/elf_begin.c:
ext/libelf/libelf_allocate.c:
include errno.h instead of sys/errno.h
ext/libelf/elf_common.h:
use the more standard uintX_t
ext/libelf/elf_strptr.c:
ext/libelf/elf_update.c:
include sysmacros.h on Solaris for roundup()
--HG--
extra : convert_revision : ea1aab834029399c445dfa4c9f78febf2c3d8f0c
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index a6659fe9b..173910010 100644 --- a/SConstruct +++ b/SConstruct @@ -182,7 +182,6 @@ for t in abs_targets: env = Environment(ENV = os.environ, # inherit user's environment vars ROOT = ROOT, SRCDIR = SRCDIR) -Export('env') #Parse CC/CXX early so that we use the correct compiler for # to test for dependencies/versions/libraries/includes @@ -192,6 +191,8 @@ if ARGUMENTS.get('CC', None): if ARGUMENTS.get('CXX', None): env['CXX'] = ARGUMENTS.get('CXX') +Export('env') + env.SConsignFile(joinpath(build_root,"sconsign")) # Default duplicate option is to use hard links, but this messes up |