summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2009-01-13 14:17:50 -0800
committerNathan Binkert <nate@binkert.org>2009-01-13 14:17:50 -0800
commit8153790d0004439f8e9d473da97699644234117b (patch)
treea9fca286e926af4be9de39894d8dd168c80cd85f /src
parent758d6ccf1f54ca20bec12598957fc1bcfa8a7ffb (diff)
downloadgem5-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')
-rw-r--r--src/SConscript5
-rw-r--r--src/arch/mips/SConscript3
-rw-r--r--src/arch/sparc/SConscript4
-rw-r--r--src/arch/x86/SConscript14
-rw-r--r--src/cpu/SConscript4
-rw-r--r--src/kern/SConscript13
-rw-r--r--src/mem/SConscript4
7 files changed, 5 insertions, 42 deletions
diff --git a/src/SConscript b/src/SConscript
index 2da5830a9..a14e868fe 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -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
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))
-
diff --git a/src/cpu/SConscript b/src/cpu/SConscript
index 334504660..f210cec9b 100644
--- a/src/cpu/SConscript
+++ b/src/cpu/SConscript
@@ -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')
diff --git a/src/kern/SConscript b/src/kern/SConscript
index b905a8b41..546c4b058 100644
--- a/src/kern/SConscript
+++ b/src/kern/SConscript
@@ -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')
diff --git a/src/mem/SConscript b/src/mem/SConscript
index c181c88c6..0b0017f81 100644
--- a/src/mem/SConscript
+++ b/src/mem/SConscript
@@ -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')