Integrate azakai's style feedback and make sanity tests pass again.

1 files changed, 4 insertions, 3 deletions

diff --git a/emscripten.py b/emscripten.py
index 3ceb0c8e..1fc0eed2 100755
--- a/emscripten.py
+++ b/emscripten.py
@@ -32,7 +32,8 @@ def path_from_root(*pathelems):
   """
   return os.path.join(__rootpath__, *pathelems)
 
-temp_files = shared.ConfigureTempFiles()
+configuration = shared.Configuration(environ=os.environ)
+temp_files = shared.make_temp_files()
 
 compiler_engine = None
 jcache = False
@@ -574,7 +575,7 @@ def main(args):
 
   emscript(args.infile, settings, args.outfile, libraries)
 
-def main():
+def _main():
   parser = optparse.OptionParser(
       usage='usage: %prog [-h] [-H HEADERS] [-o OUTFILE] [-c COMPILER_ENGINE] [-s FOO=BAR]* infile',
       description=('You should normally never use this! Use emcc instead. '
@@ -619,4 +620,4 @@ def main():
   temp_files.run_and_clean(lambda: main(keywords))
 
 if __name__ == '__main__':
-  main()
+  _main()