diff options
| author | Polina Dudnik <pdudnik@gmail.com> | 2009-08-17 11:33:32 -0500 |
|---|---|---|
| committer | Polina Dudnik <pdudnik@gmail.com> | 2009-08-17 11:33:32 -0500 |
| commit | c438b2e431066d9324238e1c678ef68a3b721f33 (patch) | |
| tree | b79e72b3074441ce01d5c95207f96f71d16bed35 /src/python/m5/__init__.py | |
| parent | 6654fe02daf6285cb43aa1c6e0e35f6c9c8786f1 (diff) | |
| parent | a43ae579dd3128a0ced2238532f26d99db197361 (diff) | |
| download | gem5-c438b2e431066d9324238e1c678ef68a3b721f33.tar.xz | |
Branch Merge
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 |