From: Brad Danofsky <bradley.danofsky@amd.com>
Date: Wed, 20 Apr 2011 18:14:51 +0000 (-0700)
Subject: scons: Allow the build directory live under an EXTRAS directory
X-Git-Tag: stable_2012_02_02~382
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dd38b4b83e6c8bf7a9031dfeead13a5ef354f46c;p=gem5.git

scons: Allow the build directory live under an EXTRAS directory
---

diff --git a/src/SConscript b/src/SConscript
index 7982eaeb4..fcae475cf 100755
--- a/src/SConscript
+++ b/src/SConscript
@@ -320,6 +320,10 @@ for root, dirs, files in os.walk(base_dir, topdown=True):
 for extra_dir in extras_dir_list:
     prefix_len = len(dirname(extra_dir)) + 1
     for root, dirs, files in os.walk(extra_dir, topdown=True):
+        # if build lives in the extras directory, don't walk down it
+        if 'build' in dirs:
+            dirs.remove('build')
+
         if 'SConscript' in files:
             build_dir = joinpath(env['BUILDDIR'], root[prefix_len:])
             SConscript(joinpath(root, 'SConscript'), variant_dir=build_dir)