From b7af65f414d34cb6b3817bc748fd053f505b0fea Mon Sep 17 00:00:00 2001
From: Stephen Hines <hines@cs.fsu.edu>
Date: Tue, 20 May 2008 14:04:53 -0400
Subject: [PATCH] SCons: Fixing SCons bug 2006 issues for non-alpha ISAs

--HG--
extra : convert_revision : 26e3edef06d6f82aaf162825c151d18faadd6e72
---
 src/arch/mips/SConscript  | 3 +++
 src/arch/sparc/SConscript | 4 ++++
 src/kern/SConscript       | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/src/arch/mips/SConscript b/src/arch/mips/SConscript
index 8be445c99..844e7ba15 100644
--- a/src/arch/mips/SConscript
+++ b/src/arch/mips/SConscript
@@ -33,6 +33,9 @@
 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 a86c00250..d4d68a6bd 100644
--- a/src/arch/sparc/SConscript
+++ b/src/arch/sparc/SConscript
@@ -32,6 +32,10 @@
 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/kern/SConscript b/src/kern/SConscript
index fd1181710..43848aada 100644
--- a/src/kern/SConscript
+++ b/src/kern/SConscript
@@ -54,3 +54,5 @@ else:
     Dir('linux')
     if env['TARGET_ISA'] == 'alpha':
         Dir('tru64')
+    elif env['TARGET_ISA'] == 'sparc':
+        Dir('solaris')