Merge pull request #1403 from imvu/scons-updates-pull-request

Bring SCons integration up to date with latest incoming and fix some SCons build reliability issues and races

1 files changed, 3 insertions, 2 deletions

diff --git a/emscripten.py b/emscripten.py
index ab68fcaa..aa47e4f1 100755
--- a/emscripten.py
+++ b/emscripten.py
@@ -11,7 +11,6 @@ headers, for the libc implementation in JS).
 
 import os, sys, json, optparse, subprocess, re, time, multiprocessing, string
 
-from tools import shared
 from tools import jsrun, cache as cache_module, tempfiles
 from tools.response_file import read_response_file
 
@@ -26,6 +25,7 @@ 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
@@ -469,6 +469,7 @@ def emscript(infile, settings, outfile, libraries=[], compiler_engine=None,
   }
 
 ''' % (sig, i, args, arg_coercions, jsret))
+      from tools import shared
       asm_setup += '\n' + shared.JS.make_invoke(sig) + '\n'
       basic_funcs.append('invoke_%s' % sig)
 
@@ -807,7 +808,7 @@ WARNING: You should normally never use this! Use emcc instead.
   '''
 
   if len(positional) != 1:
-    raise RuntimeError('Must provide exactly one positional argument.')
+    raise RuntimeError('Must provide exactly one positional argument. Got ' + str(len(positional)) + ': "' + '", "'.join(positional) + '"')
   keywords.infile = os.path.abspath(positional[0])
   if isinstance(keywords.outfile, basestring):
     keywords.outfile = open(keywords.outfile, 'w')