summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/x86/SConscript14
-rw-r--r--src/kern/SConscript4
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')