diff options
author | Nathan Binkert <nate@binkert.org> | 2009-01-13 14:17:50 -0800 |
---|---|---|
committer | Nathan Binkert <nate@binkert.org> | 2009-01-13 14:17:50 -0800 |
commit | 8153790d0004439f8e9d473da97699644234117b (patch) | |
tree | a9fca286e926af4be9de39894d8dd168c80cd85f /src/arch | |
parent | 758d6ccf1f54ca20bec12598957fc1bcfa8a7ffb (diff) | |
download | gem5-8153790d0004439f8e9d473da97699644234117b.tar.xz |
SCons: centralize the Dir() workaround for newer versions of scons.
Scons bug id: 2006 M5 Bug id: 308
Diffstat (limited to 'src/arch')
-rw-r--r-- | src/arch/mips/SConscript | 3 | ||||
-rw-r--r-- | src/arch/sparc/SConscript | 4 | ||||
-rw-r--r-- | src/arch/x86/SConscript | 14 |
3 files changed, 0 insertions, 21 deletions
diff --git a/src/arch/mips/SConscript b/src/arch/mips/SConscript index 0368e68bc..0b470def6 100644 --- a/src/arch/mips/SConscript +++ b/src/arch/mips/SConscript @@ -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') diff --git a/src/arch/sparc/SConscript b/src/arch/sparc/SConscript index 126587835..6a4c08a8e 100644 --- a/src/arch/sparc/SConscript +++ b/src/arch/sparc/SConscript @@ -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') diff --git a/src/arch/x86/SConscript b/src/arch/x86/SConscript index c2081156d..37719e75d 100644 --- a/src/arch/x86/SConscript +++ b/src/arch/x86/SConscript @@ -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)) - |