fix some build problems from prior changesets

1 files changed, 4 insertions, 1 deletions

diff --git a/src/python/m5/main.py b/src/python/m5/main.py
index cdaecc1cc..b0034c10d 100644
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -144,6 +144,8 @@ def interact(scope):
         code.InteractiveConsole(scope).interact(banner)
 
 def main(*args):
+    import m5
+
     import core
     import debug
     import defines
@@ -154,7 +156,6 @@ def main(*args):
 
     from util import fatal
 
-    global options
     if len(args) == 0:
         options, arguments = parse_options()
     elif len(args) == 2:
@@ -162,6 +163,8 @@ def main(*args):
     else:
         raise TypeError, "main() takes 0 or 2 arguments (%d given)" % len(args)
 
+    m5.options = options
+
     def check_tracing():
         if defines.TRACING_ON:
             return