diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2009-08-17 00:21:57 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2009-08-17 00:21:57 -0700 |
| commit | a43ae579dd3128a0ced2238532f26d99db197361 (patch) | |
| tree | 271a90c0fdfde8b58180ee494c528a3fbec57588 /src/python/m5/__init__.py | |
| parent | 32c8514b450a7dda77a3963d00642fcc5de658da (diff) | |
| parent | a6b39c07d9d03955382a0e930b363c6e6fd4b942 (diff) | |
| download | gem5-a43ae579dd3128a0ced2238532f26d99db197361.tar.xz | |
Merge with head.
Diffstat (limited to 'src/python/m5/__init__.py')
| -rw-r--r-- | src/python/m5/__init__.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py index 733258acf..c3512cd0d 100644 --- a/src/python/m5/__init__.py +++ b/src/python/m5/__init__.py @@ -103,8 +103,11 @@ try: except ImportError: internal = None -import defines -build_env.update(defines.buildEnv) +try: + import defines + build_env.update(defines.buildEnv) +except ImportError: + defines = None if internal: defines.compileDate = internal.core.compileDate @@ -120,4 +123,8 @@ if internal: import SimObject import params -import objects + +try: + import objects +except ImportError: + objects = None |