From: Nathan Binkert <nate@binkert.org>
Date: Thu, 2 Aug 2007 21:12:53 +0000 (-0700)
Subject: python: fix m5.build_env variable.
X-Git-Tag: m5_2.0_beta4~206^2~1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b3674749168dd4823795644b1bb820ce2876a615;p=gem5.git

python: fix m5.build_env variable.
As it is now, some objects will get the incorrect value depending where they
were defined.

--HG--
extra : convert_revision : a11a14842f9524739cbf54a48be6ec051f371200
---

diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py
index 36f2eba61..96cb2ca13 100644
--- a/src/python/m5/__init__.py
+++ b/src/python/m5/__init__.py
@@ -81,11 +81,6 @@ try:
 except ImportError:
     running_m5 = False
 
-if running_m5:
-    from event import *
-    from simulate import *
-    from main import options
-
 if running_m5:
     import defines
     build_env.update(defines.m5_build_env)
@@ -93,6 +88,11 @@ else:
     import __scons
     build_env.update(__scons.m5_build_env)
 
+if running_m5:
+    from event import *
+    from simulate import *
+    from main import options
+
 import SimObject
 import params
 import objects