From: Gabe Black <gblack@eecs.umich.edu>
Date: Sun, 7 Nov 2010 00:48:58 +0000 (-0700)
Subject: scons: Replace the build_dir parameter to SConscript with variant_dir.
X-Git-Tag: stable_2012_02_02~773
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=72b526227857c5eeb90b52fad18eb2d647a27403;p=gem5.git

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.
---

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)