sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SCons: centralize the Dir() workaround for newer versions of scons.

Browse source 
Scons bug id: 2006 M5 Bug id: 308
This commit is contained in:
Nathan Binkert 2009-01-13 14:17:50 -08:00
parent 758d6ccf1f
commit 8153790d00
7 changed files with 5 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/SConscript
View file

@ -220,6 +220,11 @@ for extra_dir in extras_dir_list:
# Add a flag defining what THE_ISA should be for all compilation
env.Append(CPPDEFINES=[('THE_ISA','%s_ISA' % env['TARGET_ISA'].upper())])
# Workaround for bug in SCons version > 0.97d20071212
# Scons bug id: 2006 M5 Bug id: 308
for root, dirs, files in os.walk(base_dir, topdown=True):
Dir(root[len(base_dir) + 1:])
########################################################################
#
# Walk the tree and execute all SConscripts in subdirectories

3
src/arch/mips/SConscript
View file

@ -33,9 +33,6 @@
Import('*')
if env['TARGET_ISA'] == 'mips':
# Workaround for bug in SCons version > 0.97d20071212
# Scons bug id: 2006 M5 Bug id: 308
Dir('isa/formats')
Source('faults.cc')
Source('regfile/int_regfile.cc')
Source('regfile/float_regfile.cc')

4
src/arch/sparc/SConscript
View file

@ -32,10 +32,6 @@
Import('*')
if env['TARGET_ISA'] == 'sparc':
# Workaround for bug in SCons version > 0.97d20071212
# Scons bug id: 2006 M5 Bug id: 308
Dir('isa/formats')
Dir('isa/formats/mem')
Source('asi.cc')
Source('faults.cc')
Source('floatregfile.cc')

14
src/arch/x86/SConscript
View file

@ -357,17 +357,3 @@ if env['TARGET_ISA'] == 'x86':
# Only non-header files need to be compiled.
if not f.path.endswith('.hh'):
Source(f)
# Workaround for bug in SCons version > 0.97d20071212
# Scons bug id: 2006 M5 Bug id: 308
from os.path import dirname, join as joinpath
Dir('isa')
Dir('isa/microops')
Dir('isa/decoder')
Dir('isa/formats')
Dir('isa/insts')
isa_dirs = set(map(lambda x:dirname(x), python_files))
for d in isa_dirs:
Dir(joinpath('isa/insts', d))

4
src/cpu/SConscript
View file

@ -149,10 +149,6 @@ if env['USE_CHECKER']:
print i,
print ", please set USE_CHECKER=False or use one of those CPU models"
Exit(1)
# Workaround for bug in SCons version > 0.97d20071212
# Scons bug id: 2006 M5 Bug id: 308
else:
Dir('checker')
TraceFlag('Activity')
TraceFlag('Commit')

13
src/kern/SConscript
View file

@ -41,22 +41,9 @@ if env['FULL_SYSTEM']:
Source('linux/linux_syscalls.cc')
Source('linux/printk.cc')
# Workaround for bug in SCons version > 0.97d20071212
# Scons bug id: 2006 M5 Bug id: 308
Dir('tru64')
if env['TARGET_ISA'] == 'alpha':
Source('tru64/dump_mbuf.cc')
Source('tru64/printf.cc')
Source('tru64/tru64_events.cc')
Source('tru64/tru64_syscalls.cc')
TraceFlag('BADADDR')
# Workaround for bug in SCons version > 0.97d20071212
# Scons bug id: 2006 M5 Bug id: 308
else:
Dir('linux')
if env['TARGET_ISA'] == 'alpha':
Dir('tru64')
elif env['TARGET_ISA'] == 'sparc':
Dir('solaris')

4
src/mem/SConscript
View file

@ -35,10 +35,6 @@ SimObject('Bus.py')
SimObject('PhysicalMemory.py')
SimObject('MemObject.py')
# Workaround for bug in SCons version > 0.97d20071212
# Scons bug id: 2006 M5 Bug id: 308
Dir('config')
Source('bridge.cc')
Source('bus.cc')
Source('dram.cc')