diff options
Diffstat (limited to 'src/python/m5/__init__.py')
| -rw-r--r-- | src/python/m5/__init__.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py index 9df3f4bfe..1edf933f9 100644 --- a/src/python/m5/__init__.py +++ b/src/python/m5/__init__.py @@ -32,15 +32,16 @@ try: # Try to import something that's generated by swig - import internal.core + import _m5.core # Try to grab something from it in case demandimport is being used - internal.core.curTick + _m5.core.curTick + in_gem5 = True except ImportError: - # The import failed - internal = None + # The import failed, we're being called from the build system + in_gem5 = False -if internal: +if in_gem5: import SimObject import core import objects |