From: Gabe Black <gabeblack@google.com>
Date: Tue, 3 Dec 2019 01:59:51 +0000 (-0800)
Subject: scons: Set the partial linking group for EXTRAS dirs.
X-Git-Tag: v19.0.0.0~222
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3b9395cd02c9611f32cea1abead058fd4f171726;p=gem5.git

scons: Set the partial linking group for EXTRAS dirs.

Partial linking heuristically links together files in the same
directory by setting a special automatic tag. That tag needs to also
be maintained when scanning EXTRAS dirs so that they don't all get
lumped in with the last normal directory that was processed.

Change-Id: I2408ea0a1eeffcf6d9994c36415a35760b225b17
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23300
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/SConscript b/src/SConscript
index 15b801a1b..76bbb9e65 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -606,6 +606,7 @@ for extra_dir in extras_dir_list:
 
         if 'SConscript' in files:
             build_dir = joinpath(env['BUILDDIR'], root[prefix_len:])
+            Source.set_group(build_dir)
             SConscript(joinpath(root, 'SConscript'), variant_dir=build_dir)
 
 for opt in export_vars: