SCons: Manually specifying header only directories with Dir() works around the problem

--HG--
extra : convert_revision : d9713228d934cf4a45114a972603b8bca2bd27d3

diff --git a/SConstruct b/SConstruct
index f47618cf6e41aeaffb53173f2f467b4b69526fae..792cb7554e86db973af5074e5b4b3fdab31334a9 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -143,9 +143,6 @@ def CheckSCons(bad_ver_strs):
 CheckSCons(( 
     # We need a version that is 0.96.91 or newer
     ('0.0.0', '0.96.90'), 
-    # This range has a bug with linking directories into the build dir
-    # that only have header files in them 
-    ('0.97.0d20071212', '0.98.0')
     ))
 
 

diff --git a/src/cpu/SConscript b/src/cpu/SConscript
index c7d0c33bdcc012ee44f6a6e3e2e3a470021bc942..2abddef22c982caa7f28390d3955c809cd7571d4 100644 (file)
--- a/src/cpu/SConscript
+++ b/src/cpu/SConscript
@@ -148,6 +148,8 @@ if env['USE_CHECKER']:
             print i,
         print ", please set USE_CHECKER=False or use one of those CPU models"
         Exit(1)
+else:
+    Dir('checker')
 
 TraceFlag('Activity')
 TraceFlag('Commit')

diff --git a/src/mem/SConscript b/src/mem/SConscript
index b572f703c3b1adc3a90d9910a89628491d5b1f07..0fdf9f9bb65299356a41e37add6928061a04c03a 100644 (file)
--- a/src/mem/SConscript
+++ b/src/mem/SConscript
@@ -35,6 +35,8 @@ SimObject('Bus.py')
 SimObject('PhysicalMemory.py')
 SimObject('MemObject.py')
 
+Dir('config')
+
 Source('bridge.cc')
 Source('bus.cc')
 Source('dram.cc')