From 7ccec8c0e2937a365eb2cbb61b3dced9789cb7c5 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 21 Oct 2019 16:10:29 -0700
Subject: [PATCH] Tweak wasm binding to work with new upstream LLVM backend

---
 lib/binding_web/binding.js | 5 ++++-
 script/build-wasm          | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/binding_web/binding.js b/lib/binding_web/binding.js
index a6853019..7f631844 100644
--- a/lib/binding_web/binding.js
+++ b/lib/binding_web/binding.js
@@ -874,7 +874,10 @@ class Language {
     return bytes
       .then(bytes => loadWebAssemblyModule(bytes, {loadAsync: true}))
       .then(mod => {
-        const functionName = Object.keys(mod).find(key => key.includes("tree_sitter_"));
+        const functionName = Object.keys(mod).find(key =>
+          key.includes("tree_sitter_") &&
+          !key.includes("external_scanner_")
+        );
         const languageAddress = mod[functionName]();
         return new Language(INTERNAL, languageAddress);
       });
diff --git a/script/build-wasm b/script/build-wasm
index 0a06fcb4..63ec4fe0 100755
--- a/script/build-wasm
+++ b/script/build-wasm
@@ -62,14 +62,12 @@ done
 
 emcc=
 if which emcc > /dev/null && [[ "$force_docker" == "0" ]]; then
-  export EMCC_FORCE_STDLIBS=libc++
   emcc=emcc
 elif which docker > /dev/null; then
   emcc="docker run               \
     --rm                         \
     -v $(pwd):/src:Z             \
     -u $(id -u)                  \
-    -e EMCC_FORCE_STDLIBS=libc++ \
     trzeci/emscripten-slim       \
     emcc"
 else