summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiacomo Travaglini <giacomo.travaglini@arm.com>2017-11-21 11:08:12 +0000
committerGiacomo Travaglini <giacomo.travaglini@arm.com>2017-11-21 14:59:31 +0000
commit03b231eb48a9d37c39a7ac8a95cb0c0fc7dae641 (patch)
tree129d418e4ebc1baec11f17044a6fee1423b2b011
parent4d893c215ef82358c62bfbb44dc4fef57c524df0 (diff)
downloadgem5-03b231eb48a9d37c39a7ac8a95cb0c0fc7dae641.tar.xz
scons: Build error introduced by site_tools/default.py
One of the latest commits affecting the build system introduced a change in the environment setting: rather than using the ENV dictionary, environment key-val pairs were saved directly into the class. This patch reverts that behaviour. Change-Id: If206ba0a34ac8c35695a493cb90654b7ec81971b Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-on: https://gem5-review.googlesource.com/5941 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
-rw-r--r--site_scons/site_tools/default.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/site_scons/site_tools/default.py b/site_scons/site_tools/default.py
index 73c4a9eaf..9d02ab73b 100644
--- a/site_scons/site_tools/default.py
+++ b/site_scons/site_tools/default.py
@@ -64,7 +64,7 @@ def common_config(env):
for key,val in sorted(os.environ.iteritems()):
if key in use_vars or \
any([key.startswith(prefix) for prefix in use_prefixes]):
- env[key] = val
+ env['ENV'][key] = val
# Tell scons to avoid implicit command dependencies to avoid issues
# with the param wrappes being compiled twice (see