diff options
| author | Nathan Binkert <nate@binkert.org> | 2009-04-21 17:17:16 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2009-04-21 17:17:16 -0700 |
| commit | 05d8c9acb8a5a985956998fc13551288496e5cdc (patch) | |
| tree | 3f7a317070d035f6a9e1d846841733e99c837a23 /ext | |
| parent | 56e5509bfd4e670c032ccff4c7d68dbe7493eadd (diff) | |
| download | gem5-05d8c9acb8a5a985956998fc13551288496e5cdc.tar.xz | |
scons: Rename the basic environment from env -> main.
env is used as a local variable all over the place and sometimes it is
easy to get confused as to whether the global env or local env is being
used. This will become especially important when I change the way we
support our variants.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/gzstream/SConscript | 10 | ||||
| -rw-r--r-- | ext/libelf/SConscript | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ext/gzstream/SConscript b/ext/gzstream/SConscript index ef591229e..c8432ae15 100644 --- a/ext/gzstream/SConscript +++ b/ext/gzstream/SConscript @@ -28,11 +28,11 @@ # # Authors: Nathan Binkert -Import('env') +Import('main') -env.Library('gzstream', [File('gzstream.cc')]) +main.Library('gzstream', [File('gzstream.cc')]) -env.Prepend(CPPPATH=Dir('.')) -env.Append(LIBS=['gzstream']) -env.Prepend(LIBPATH=[Dir('.')]) +main.Prepend(CPPPATH=Dir('.')) +main.Append(LIBS=['gzstream']) +main.Prepend(LIBPATH=[Dir('.')]) diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript index dff6fdaa9..71cf9840d 100644 --- a/ext/libelf/SConscript +++ b/ext/libelf/SConscript @@ -30,7 +30,7 @@ import os, subprocess -Import('env') +Import('main') elf_files = [] def ElfFile(filename): @@ -87,9 +87,9 @@ ElfFile('libelf_convert.c') ElfFile('libelf_fsize.c') ElfFile('libelf_msize.c') -m4env = env.Clone() -if env['GCC']: - major,minor,dot = [ int(x) for x in env['CXXVERSION'].split('.')] +m4env = main.Clone() +if m4env['GCC']: + major,minor,dot = [ int(x) for x in m4env['CXXVERSION'].split('.')] if major >= 4: m4env.Append(CCFLAGS=['-Wno-pointer-sign']) m4env.Append(CCFLAGS=['-Wno-implicit']) @@ -119,7 +119,7 @@ m4env.M4(target=File('libelf_msize.c'), # into either m5 or the library m4env.Library('elf', [m4env.SharedObject(f) for f in elf_files]) -env.Prepend(CPPPATH=Dir('.')) -env.Append(LIBS=['elf']) -env.Prepend(LIBPATH=[Dir('.')]) +main.Prepend(CPPPATH=Dir('.')) +main.Append(LIBS=['elf']) +main.Prepend(LIBPATH=[Dir('.')]) |