summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-11-06 17:48:58 -0700
committerGabe Black <gblack@eecs.umich.edu>2010-11-06 17:48:58 -0700
commit72b526227857c5eeb90b52fad18eb2d647a27403 (patch)
tree292248b50e4b7a465c8313319cdbd57619923e41
parentb53231e7feeb6535f9bbb06a8bfd52208d6fa215 (diff)
downloadgem5-72b526227857c5eeb90b52fad18eb2d647a27403.tar.xz
scons: Replace the build_dir parameter to SConscript with variant_dir.
The build_dir parameter name has been deprecated and replaced with variant_dir. This change switches us over to avoid warning spew in newer versions of scons.
-rw-r--r--src/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/SConscript b/src/SConscript
index ec3f5373b..c0718c66b 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -248,14 +248,14 @@ for root, dirs, files in os.walk(base_dir, topdown=True):
if 'SConscript' in files:
build_dir = joinpath(env['BUILDDIR'], root[len(base_dir) + 1:])
- SConscript(joinpath(root, 'SConscript'), build_dir=build_dir)
+ SConscript(joinpath(root, 'SConscript'), variant_dir=build_dir)
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 'SConscript' in files:
build_dir = joinpath(env['BUILDDIR'], root[prefix_len:])
- SConscript(joinpath(root, 'SConscript'), build_dir=build_dir)
+ SConscript(joinpath(root, 'SConscript'), variant_dir=build_dir)
for opt in export_vars:
env.ConfigFile(opt)