derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons: Rename the basic environment from env -> main.

Browse Source 
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.
This commit is contained in:
Nathan Binkert
2009-04-21 17:17:16 -07:00
parent 56e5509bfd
commit 05d8c9acb8
3 changed files with 82 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ext/gzstream/SConscript
View File

@@ -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('.')])

14
ext/libelf/SConscript
View File

@@ -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('.')])