Look for binaryen.js/wasm.js in install directory as well as source dir (emscripten-core#6407)

sbc100 · web-flow · commit 56e1a9019dd1 · 2018-04-02T13:39:26.000-07:00
diff --git a/emcc.py b/emcc.py
@@ -106,7 +106,8 @@ def exit_with_error(message):
 
 class Intermediate(object):
   counter = 0
-# this method uses the global 'final' variable, which contains the current
+
+# this function uses the global 'final' variable, which contains the current
 # final output file. if a method alters final, and calls this method, then it
 # must modify final globally (i.e. it can't receive final as a param and
 # return it)
@@ -119,6 +120,7 @@ def save_intermediate(name=None, suffix='js'):
     return
   shutil.copyfile(final, name)
   Intermediate.counter += 1
+
 def save_intermediate_with_wasm(name, wasm_binary):
   save_intermediate(name) # save the js
   name = os.path.join(shared.get_emscripten_temp_dir(), 'emcc-%d-%s.wasm' % (Intermediate.counter - 1, name))
@@ -2297,6 +2299,7 @@ def do_binaryen(target, asm_target, options, memfile, wasm_binary_target,
   global final
   logging.debug('using binaryen, with method: ' + shared.Settings.BINARYEN_METHOD)
   binaryen_bin = shared.Building.get_binaryen_bin()
+  binaryen_lib = shared.Building.get_binaryen_lib()
   # Emit wasm.js at the top of the js. This is *not* optimized with the rest of the code, since
   # (1) it contains asm.js, whose validation would be broken, and (2) it's very large so it would
   # be slow in cleanup/JSDCE etc.
@@ -2305,7 +2308,7 @@ def do_binaryen(target, asm_target, options, memfile, wasm_binary_target,
   # BINARYEN_METHOD with something that doesn't use the polyfill, then we don't need it.
   if not shared.Settings.BINARYEN_METHOD or 'interpret' in shared.Settings.BINARYEN_METHOD:
     logging.debug('integrating wasm.js polyfill interpreter')
-    wasm_js = open(os.path.join(binaryen_bin, 'wasm.js')).read()
+    wasm_js = open(os.path.join(binaryen_lib, 'wasm.js')).read()
     wasm_js = wasm_js.replace('EMSCRIPTEN_', 'emscripten_') # do not confuse the markers
     js = open(final).read()
     combined = open(final, 'w')
diff --git a/tools/shared.py b/tools/shared.py
@@ -2363,7 +2363,7 @@ def path_to_system_js_libraries(library_name):
     else:
       if Settings.ERROR_ON_MISSING_LIBRARIES:
         logging.fatal('emcc: cannot find library "%s"', library_name)
-        exit(1)
+        sys.exit(1)
       else:
         logging.warning('emcc: cannot find library "%s"', library_name)
 
@@ -2396,6 +2396,19 @@ def get_binaryen_bin():
     Building.get_binaryen()
     return os.path.join(Settings.BINARYEN_ROOT, 'bin')
 
+  @staticmethod
+  def get_binaryen_lib():
+    Building.get_binaryen()
+    # The wasm.js and binaryen.js libraries live in 'bin' in the binaryen
+    # source tree, but are installed to share/binaryen.
+    paths = (os.path.join(Settings.BINARYEN_ROOT, 'bin'),
+             os.path.join(Settings.BINARYEN_ROOT, 'share', 'binaryen'))
+    for dirname in paths:
+      if os.path.exists(os.path.join(dirname, 'binaryen.js')):
+         return dirname
+    logging.fatal('emcc: cannot find binaryen js libraries (tried: %s)' % str(paths))
+    sys.exit(1)
+
 # compatibility with existing emcc, etc. scripts
 Cache = cache.Cache(debug=DEBUG_CACHE)
 chunkify = cache.chunkify
