scons: Allow the build directory live under an EXTRAS directory

diff --git a/src/SConscript b/src/SConscript
index 7982eaeb474cc04760177f5755f2e5f2ad67d1c6..fcae475cf8f66e17a538b422ed516c876d24231d 100755 (executable)
--- 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)