From ed27c4c52183d9527a0c123b9be84bbe968f4afa Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Tue, 8 Apr 2008 11:08:26 -0400 Subject: [PATCH] SCons: Manually specifying header only directories with Dir() works around the problem --HG-- extra : convert_revision : d9713228d934cf4a45114a972603b8bca2bd27d3 --- SConstruct | 3 --- src/cpu/SConscript | 2 ++ src/mem/SConscript | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index f47618cf6..792cb7554 100644 --- 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 c7d0c33bd..2abddef22 100644 --- 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 b572f703c..0fdf9f9bb 100644 --- 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') -- 2.30.2