From: Steve Reinhardt <stever@gmail.com>
Date: Mon, 11 Feb 2008 15:47:44 +0000 (-0800)
Subject: Wait to set BUILD_DIR until *after* env is copied.
X-Git-Tag: m5_2.0_beta5~20
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=476a2ee950d989a501e4eedf164185690f967f1f;p=gem5.git

Wait to set BUILD_DIR until *after* env is copied.

--HG--
extra : convert_revision : 03153e7aaa1fb2a435900eab08a98ec1a6ce62db
---

diff --git a/SConstruct b/SConstruct
index 3bbd60f37..4a0f64148 100644
--- a/SConstruct
+++ b/SConstruct
@@ -698,13 +698,14 @@ base_env = env
 
 for build_path in build_paths:
     print "Building in", build_path
+
+    # Make a copy of the build-root environment to use for this config.
+    env = base_env.Copy()
     env['BUILDDIR'] = build_path
 
     # build_dir is the tail component of build path, and is used to
     # determine the build parameters (e.g., 'ALPHA_SE')
     (build_root, build_dir) = os.path.split(build_path)
-    # Make a copy of the build-root environment to use for this config.
-    env = base_env.Copy()
 
     # Set env options according to the build directory config.
     sticky_opts.files = []