aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-04-04 14:15:57 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-04-04 14:15:57 -0700
commit2e989babe021ee8b08d3d75917e74f8f8b2c334a (patch)
tree39c53444b73d7bdd9fb8604184eda2601c0ca543
parenta61d054621e06f41dd760552a6db3d2a38006f90 (diff)
parentd43e5283a483e43d31dae1c8236f3499e4bbd577 (diff)
Merge pull request #1029 from waywardmonkeys/fix-get-configuration
Make get_configuration() a global.
-rwxr-xr-xemscripten.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/emscripten.py b/emscripten.py
index d41aaa2c..c6a08e6a 100755
--- a/emscripten.py
+++ b/emscripten.py
@@ -20,6 +20,15 @@ def path_from_root(*pathelems):
"""
return os.path.join(__rootpath__, *pathelems)
+def get_configuration():
+ if hasattr(get_configuration, 'configuration'):
+ return get_configuration.configuration
+
+ from tools import shared
+ configuration = shared.Configuration(environ=os.environ)
+ get_configuration.configuration = configuration
+ return configuration
+
def scan(ll, settings):
# blockaddress(@main, %23)
blockaddrs = []
@@ -683,15 +692,6 @@ WARNING: You should normally never use this! Use emcc instead.
else:
relooper = None # use the cache
- def get_configuration():
- if hasattr(get_configuration, 'configuration'):
- return get_configuration.configuration
-
- from tools import shared
- configuration = shared.Configuration(environ=os.environ)
- get_configuration.configuration = configuration
- return configuration
-
if keywords.temp_dir is None:
temp_files = get_configuration().get_temp_files()
else: