Merge branch 'master' into llvmopts

1 files changed, 3 insertions, 2 deletions

diff --git a/emcc b/emcc
index ef5aae44..e541944a 100755
--- a/emcc
+++ b/emcc
@@ -41,10 +41,11 @@ Example uses:
 
  * For SCons the shared.py can be imported like so:
     __file__ = str(Dir('#/project_path_to_emscripten/dummy/dummy'))
-    __rootpath__ = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+    __rootpath__ = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
     def path_from_root(*pathelems):
       return os.path.join(__rootpath__, *pathelems)
-    exec(open(path_from_root('tools', 'shared.py'), 'r').read())
+    sys.path += [path_from_root('')]
+    from tools.shared import *
     
    For using the Emscripten compilers/linkers/etc. you can do:
     env = Environment()