diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2008-06-11 10:54:08 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2008-06-11 10:54:08 -0400 |
| commit | fd3e661cd3c9d6e5424864b3986a51b940ce01eb (patch) | |
| tree | 3542146f47ca22a52b06a5578acba64f24d1656f | |
| parent | 87f981e2081386984f049359d13f5c939e3024aa (diff) | |
| download | gem5-fd3e661cd3c9d6e5424864b3986a51b940ce01eb.tar.xz | |
SCons: Fix more SCons version issues
| -rw-r--r-- | src/arch/x86/SConscript | 14 | ||||
| -rw-r--r-- | src/kern/SConscript | 4 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/arch/x86/SConscript b/src/arch/x86/SConscript index 674cd54c2..09967b0d3 100644 --- a/src/arch/x86/SConscript +++ b/src/arch/x86/SConscript @@ -353,3 +353,17 @@ 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/kern/SConscript b/src/kern/SConscript index 43848aada..b905a8b41 100644 --- a/src/kern/SConscript +++ b/src/kern/SConscript @@ -40,6 +40,10 @@ if env['FULL_SYSTEM']: Source('linux/events.cc') 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') |