Merge: No changes

--HG--
extra : convert_revision : ee56f958f6b295571cf881b81380cfba3d4ce02e

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