summaryrefslogtreecommitdiff
path: root/src/python
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2007-08-02 14:12:53 -0700
committerNathan Binkert <nate@binkert.org>2007-08-02 14:12:53 -0700
commitb3674749168dd4823795644b1bb820ce2876a615 (patch)
tree7fa83cd23f457363c5f1d97bd340e35ce747bb2f /src/python
parentdfa147a70ac87cdc5804993a0b39dfb8bb4cfa1b (diff)
downloadgem5-b3674749168dd4823795644b1bb820ce2876a615.tar.xz
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
Diffstat (limited to 'src/python')
-rw-r--r--src/python/m5/__init__.py10
1 files changed, 5 insertions, 5 deletions
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
@@ -82,17 +82,17 @@ 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)
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