From 85cf370a74b4065f9411e707900f0895fa8f14a1 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 15 May 2020 11:15:58 -0400
Subject: [PATCH 001/161] 1.39.16 (#503)

Also update precompiled lib tests, for the new cache logic.
---
 emscripten-releases-tags.txt |  3 ++-
 scripts/test.py              | 46 +++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 8206654625..a416d20a74 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "1.39.15",
+  "latest": "1.39.16",
   "releases": {
+    "1.39.16": "ae5001fac3849895a873e422a2a80afc90f3b798",
     "1.39.15": "3880c744c068986d4ee781a61f7b2e820043e11f",
     "1.39.14": "574ad04affb82cc36a32dd89b2a87bea4fb30eba",
     "1.39.13": "7b3cd38017f7c582cfa3ac24a9f12aa6a8dca51f",
diff --git a/scripts/test.py b/scripts/test.py
index e1194d0de9..914313b449 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -11,6 +11,14 @@
 
 assert 'EM_CONFIG' in os.environ, "emsdk should be activated before running this script"
 
+LIBC = os.environ['EM_CACHE'] + '/wasm/libc.a'
+
+# Remove the EM_CACHE environment variable.  It interferes with testing since
+# it would otherwise be fixed for the duration of the script and we expect
+# "emsdk activate" to be able switch between SDKs during the running of this
+# script.
+del os.environ['EM_CACHE']
+
 emconfig = os.environ['EM_CONFIG']
 upstream_emcc = os.path.join('upstream', 'emscripten', 'emcc')
 fastcomp_emcc = os.path.join('fastcomp', 'emscripten', 'emcc')
@@ -80,8 +88,6 @@ def hack_emsdk(marker, replacement):
 
 TAGS = json.loads(open('emscripten-releases-tags.txt').read())
 
-LIBC = os.environ['EM_CACHE'] + '/wasm/libc.a'
-
 # Tests
 
 print('test .emscripten contents (latest was installed/activated in test.sh)')
@@ -95,31 +101,27 @@ def hack_emsdk(marker, replacement):
 
 
 def test_lib_building(emcc, use_asmjs_optimizer):
-  def test_build(args, expected=None, unexpected=None):
+  cache_building_messages = ['generating system library: ']
+
+  def test_build(args, expected):
+    if expected:
+      expected = cache_building_messages
+      unexpected = []
+    else:
+      expected = []
+      unexpected = cache_building_messages
     checked_call_with_output(emcc + ' hello_world.c' + args,
                              expected=expected,
                              unexpected=unexpected,
                              stderr=subprocess.STDOUT)
 
-  # by default we ship libc, struct_info, and the asm.js optimizer, as they
-  # are important for various reasons (libc takes a long time to build;
-  # struct_info is a bootstrap product so if the user's setup is broken it's
-  # confusing; the asm.js optimizer is a native application so it needs a
-  # working native local build environment). otherwise we don't ship every
-  # single lib, so some building is expected on first run.
-
-  unexpected_system_libs = ['generating system library: libc.',
-                            'generating system asset: optimizer']
-  if use_asmjs_optimizer:
-    unexpected_system_libs += ['generating system asset: generated_struct_info.json']
-
-  first_time_system_libs = ['generating system library: libdlmalloc.']
-
-  test_build('', expected=first_time_system_libs,
-             unexpected=unexpected_system_libs)
-  test_build(' -O2', unexpected=unexpected_system_libs + first_time_system_libs)
-  test_build(' -s WASM=0', unexpected=unexpected_system_libs + first_time_system_libs)
-  test_build(' -O2 -s WASM=0', unexpected=unexpected_system_libs + first_time_system_libs)
+  # The emsdk ships all system libraries so we don't expect to see any
+  # cache population unless we explicly --clear-cache.
+  test_build('', expected=False)
+  check_call(emcc + ' --clear-cache')
+  test_build(' -O2', expected=True)
+  test_build(' -s WASM=0', expected=False)
+  test_build(' -O2 -s WASM=0', expected=False)
 
 
 def run_emsdk(cmd):

From 5613488e753e05170967052fab74254eb9763d4f Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Thu, 21 May 2020 10:35:48 -0700
Subject: [PATCH 002/161] Properly report what is installed in "emsdk list"
 (#505)

This expands on #460 which added a file in each install dir
with the version, that lets us know not to re-download it. That
didn't integrate with is_installed, so it wasn't reported properly,
which this PR fixes.

With this we can remove a hack for python, as we can simply
not install anything if it's already installed (see line 1859).

Also add the "INSTALLED" indicators on the main listings in
"emsdk list".

Bug was reported in #477
---
 emsdk.py        | 60 +++++++++++++++++++++++++++++--------------------
 scripts/test.py |  4 ++++
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index a6a287feda..04a33aa92b 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -1661,7 +1661,27 @@ def compatible_with_this_os(self):
 
     return hasattr(self, 'url')
 
-  def is_installed(self):
+  # the "version file" is a file inside install dirs that indicates the
+  # version installed there. this helps disambiguate when there is more than
+  # one version that may be installed to the same directory (which is used
+  # to avoid accumulating builds over time in some cases, with new builds
+  # overwriting the old)
+  def get_version_file_path(self):
+    return os.path.join(self.installation_path(), '.emsdk_version')
+
+  def is_installed_version(self):
+    version_file_path = self.get_version_file_path()
+    if os.path.isfile(version_file_path):
+      with open(version_file_path, 'r') as version_file:
+        return version_file.read() == self.name
+    return False
+
+  def update_installed_version(self):
+    with open(self.get_version_file_path(), 'w') as version_file:
+      version_file.write(self.name)
+    return None
+
+  def is_installed(self, skip_version_check=False):
     # If this tool/sdk depends on other tools, require that all dependencies are
     # installed for this tool to count as being installed.
     if hasattr(self, 'uses'):
@@ -1707,7 +1727,7 @@ def each_path_exists(pathlist):
       else:
         raise Exception('Unknown custom_is_installed_script directive "' + self.custom_is_installed_script + '"!')
 
-    return content_exists
+    return content_exists and (skip_version_check or self.is_installed_version())
 
   def is_active(self):
     if not self.is_installed():
@@ -1836,24 +1856,10 @@ def install_sdk(self):
     return True
 
   def install_tool(self):
-    # We should not force reinstallation of python if it already exists, since that very python
-    # may be interpreting the current emsdk.py script we are executing. On Windows this would
-    # lead to a failure to uncompress the python zip file as the python executable files are in use.
-    # TODO: Refactor codebase to avoid needing this kind of special case check by being more
-    # careful about reinstallation, see https://github.com/emscripten-core/emsdk/pull/394#issuecomment-559386468
-    # for a scheme that would work.
-    if self.id == 'python' and self.is_installed():
+    if self.is_installed():
       print("Skipped installing " + self.name + ", already installed.")
       return True
 
-    version_id = self.name
-    version_file_path = os.path.join(self.installation_path(), '.emsdk_version')
-    if os.path.isfile(version_file_path):
-      with open(version_file_path, 'r') as version_file:
-        if version_id == version_file.read():
-          print("Skipped installing " + self.name + ", already installed.")
-          return True
-
     print("Installing tool '" + str(self) + "'..")
     url = self.download_url()
 
@@ -1912,10 +1918,9 @@ def install_tool(self):
 
     # Sanity check that the installation succeeded, and if so, remove unneeded
     # leftover installation files.
-    if self.is_installed():
+    if self.is_installed(skip_version_check=True):
       self.cleanup_temp_install_files()
-      with open(version_file_path, 'w') as version_file:
-        version_file.write(version_id)
+      self.update_installed_version()
     else:
       print("Installation of '" + str(self) + "' failed, but no error was detected. Either something went wrong with the installation, or this may indicate an internal emsdk error.")
       return False
@@ -2079,6 +2084,10 @@ def get_emscripten_releases_tot():
   return ''
 
 
+def get_release_hash(arg, releases_info):
+  return releases_info.get(arg, None) or releases_info.get('sdk-' + arg + '-64bit')
+
+
 # Finds the best-matching python tool for use.
 def find_used_python():
   # Find newest tool first - those are always at the end of the list.
@@ -2876,7 +2885,7 @@ def extract_bool_arg(name):
           arg = arg.replace('-fastcomp', '')
           backend = 'fastcomp'
         arg = arg.replace('sdk-', '').replace('-64bit', '').replace('tag-', '')
-        release_hash = releases_info.get(arg, None) or releases_info.get('sdk-' + arg + '-64bit')
+        release_hash = get_release_hash(arg, releases_info)
         if release_hash:
           if backend is None:
             if version_key(arg) >= (1, 39, 0):
@@ -2888,6 +2897,9 @@ def extract_bool_arg(name):
   if cmd == 'list':
     print('')
 
+    def installed_sdk_text(name):
+      return 'INSTALLED' if find_sdk(name).is_installed() else ''
+
     if (LINUX or OSX or WINDOWS) and (ARCH == 'x86' or ARCH == 'x86_64'):
       print('The *recommended* precompiled SDK download is %s (%s).' % (find_latest_releases_version(), find_latest_releases_hash()))
       print()
@@ -2896,8 +2908,8 @@ def extract_bool_arg(name):
       print('         latest-fastcomp         [legacy (fastcomp) backend]')
       print('')
       print('Those are equivalent to installing/activating the following:')
-      print('         %s' % find_latest_releases_version())
-      print('         %s-fastcomp' % find_latest_releases_version())
+      print('         %s             %s' % (find_latest_releases_version(), installed_sdk_text(find_latest_releases_sdk('upstream'))))
+      print('         %s-fastcomp    %s' % (find_latest_releases_version(), installed_sdk_text(find_latest_releases_sdk('fastcomp'))))
       print('')
     else:
       print('Warning: your platform does not have precompiled SDKs available.')
@@ -2908,7 +2920,7 @@ def extract_bool_arg(name):
     releases_versions = sorted(load_releases_versions())
     releases_versions.reverse()
     for ver in releases_versions:
-      print('         %s' % ver)
+      print('         %s    %s' % (ver, installed_sdk_text('sdk-releases-upstream-%s-64bit' % get_release_hash(ver, releases_info))))
     print()
 
     # Use array to work around the lack of being able to mutate from enclosing
diff --git a/scripts/test.py b/scripts/test.py
index 914313b449..d8c3b01c4b 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -97,6 +97,10 @@ def hack_emsdk(marker, replacement):
 # Test we don't re-download unnecessarily
 checked_call_with_output(emsdk + ' install latest', expected='already installed', unexpected='Downloading:')
 
+# Test we report installed tools properly. The latest version should be
+# installed, but not some random old one.
+checked_call_with_output(emsdk + ' list', expected=TAGS['latest'] + '    INSTALLED', unexpected='1.39.15    INSTALLED:')
+
 print('building proper system libraries')
 
 

From 855c51d36d2bb61e3ce90794d4a1f17fb5a9dd88 Mon Sep 17 00:00:00 2001
From: Orestis Floros <orestisflo@gmail.com>
Date: Thu, 28 May 2020 22:25:23 +0200
Subject: [PATCH 003/161] Improve behaviour regarding "help" (#509)

Also accept -h for help.

This is the usual behaviour of most utils that accept --help.

Also, now an empty call to ./emsdk does not print the full help, as
discussed in #509.
---
 emsdk.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 04a33aa92b..e0ff593fe1 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2677,11 +2677,11 @@ def error_on_missing_tool(name):
 def main():
   global emscripten_config_directory, BUILD_FOR_TESTING, ENABLE_LLVM_ASSERTIONS, TTY_OUTPUT
 
-  if len(sys.argv) <= 1 or sys.argv[1] == 'help' or sys.argv[1] == '--help':
-    if len(sys.argv) <= 1:
-      print(' emsdk: No command given. Please call one of the following:')
-    else:
-      print(' emsdk: Available commands:')
+  if len(sys.argv) <= 1:
+    print("Missing command; Type 'emsdk help' to get a list of commands.")
+    return 1
+  if sys.argv[1] in ('help', '--help', '-h'):
+    print(' emsdk: Available commands:')
 
     print('''
    emsdk list [--old] [--uses]  - Lists all available SDKs and tools and their
@@ -2798,7 +2798,7 @@ def main():
        'activate' commands and the invocation of 'emsdk_env', or otherwise
        these commands will default to operating on the default build type
        which in and RelWithDebInfo.''')
-    return 1
+    return 0
 
   # Extracts a boolean command line argument from sys.argv and returns True if it was present
   def extract_bool_arg(name):

From 858b176f68ddd040e505f7ce6af637e99cdb9d42 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 29 May 2020 12:49:51 -0400
Subject: [PATCH 004/161] Use embedded configuration by default (#472)

This is part of a wider plan to remove the use of the user's HOME
directory completely:
  https://github.com/emscripten-core/emscripten/issues/9543
---
 emsdk.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index e0ff593fe1..820ad736e4 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2760,15 +2760,15 @@ def main():
 
     if WINDOWS:
       print('''
-   emsdk activate [--global] [--embedded] [--build=type] [--vs2017/--vs2019] <tool/sdk>
+   emsdk activate [--global] [--[no-]embedded] [--build=type] [--vs2017/--vs2019] <tool/sdk>
 
                                 - Activates the given tool or SDK in the
                                   environment of the current shell. If the
                                   --global option is passed, the registration
                                   is done globally to all users in the system
-                                  environment. If the --embedded option is
-                                  passed, all Emcripten configuration files as
-                                  well as the temp, cache and ports directories
+                                  environment. In embedded mode (the default)
+                                  all Emcripten configuration files as well as
+                                  the temp, cache and ports directories
                                   are located inside the Emscripten SDK
                                   directory rather than the user home
                                   directory. If a custom compiler version was
@@ -2779,11 +2779,11 @@ def main():
    emcmdprompt.bat              - Spawns a new command prompt window with the
                                   Emscripten environment active.''')
     else:
-      print('''   emsdk activate [--embedded] [--build=type] <tool/sdk>
+      print('''   emsdk activate [--[no-]embedded] [--build=type] <tool/sdk>
 
                                 - Activates the given tool or SDK in the
-                                  environment of the current shell. If the
-                                  --embedded option is passed, all Emcripten
+                                  environment of the current shell. In
+                                  embedded mode (the default), all Emcripten
                                   configuration files as well as the temp, cache
                                   and ports directories are located inside the
                                   Emscripten SDK directory rather than the user
@@ -2810,6 +2810,7 @@ def extract_bool_arg(name):
   arg_uses = extract_bool_arg('--uses')
   arg_global = extract_bool_arg('--global')
   arg_embedded = extract_bool_arg('--embedded')
+  arg_embedded = not extract_bool_arg('--no-embedded')
   arg_notty = extract_bool_arg('--notty')
   if arg_notty:
     TTY_OUTPUT = False

From 6b0d151917fe508007d9d76791369ec94c4eb304 Mon Sep 17 00:00:00 2001
From: Orestis Floros <orestisflo@gmail.com>
Date: Tue, 2 Jun 2020 00:15:41 +0200
Subject: [PATCH 005/161] Properly sort versions in "emsdk list" (#508)

Split version to integers but avoid exceptions in case there is a
non-numerical character in some version.

Comparison:
    Before   |   After
    1.39.9       1.39.16
    1.39.8       1.39.15
    1.39.7       1.39.14
    1.39.6       1.39.13
    1.39.5       1.39.12
    1.39.4       1.39.11
    1.39.3       1.39.10
    1.39.2       1.39.9
    1.39.16      1.39.8
    1.39.15      1.39.7
    1.39.14      1.39.6
    1.39.13      1.39.5
    1.39.12      1.39.4
    1.39.11      1.39.3
    1.39.10      1.39.2
    1.39.1       1.39.1
    1.39.0       1.39.0
    1.38.48      1.38.48
    1.38.47      1.38.47
    1.38.46      1.38.46
    1.38.45      1.38.45
    1.38.44      1.38.44
    1.38.43      1.38.43
    1.38.42      1.38.42
    1.38.41      1.38.41
    1.38.40      1.38.40
    1.38.39      1.38.39
    1.38.38      1.38.38
    1.38.37      1.38.37
    1.38.36      1.38.36
    1.38.35      1.38.35
    1.38.34      1.38.34
    1.38.33      1.38.33
---
 emsdk.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 820ad736e4..660f86af0d 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2918,8 +2918,11 @@ def installed_sdk_text(name):
       print('')
 
     print('All recent (non-legacy) installable versions are:')
-    releases_versions = sorted(load_releases_versions())
-    releases_versions.reverse()
+    releases_versions = sorted(
+      load_releases_versions(),
+      key=lambda x: [int(v) if v.isdigit() else -1 for v in x.split('.')],
+      reverse=True,
+    )
     for ver in releases_versions:
       print('         %s    %s' % (ver, installed_sdk_text('sdk-releases-upstream-%s-64bit' % get_release_hash(ver, releases_info))))
     print()

From ede26f1709d6afda864b087f1423454d9a14697c Mon Sep 17 00:00:00 2001
From: "Piotr Paczkowski (trzeci.eu)" <kontakt@trzeci.eu>
Date: Thu, 4 Jun 2020 22:02:17 +0200
Subject: [PATCH 006/161] Add host network for building image (#514)

Without --network host It's impossible to build images
---
 docker/Makefile  | 2 +-
 docker/README.md | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/Makefile b/docker/Makefile
index 9527fe8f4c..fa02f456fb 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -11,7 +11,7 @@ ifndef version
 endif
 
 build: .TEST
-	docker build --build-arg=EMSCRIPTEN_VERSION=${version} --tag emscripten/emsdk:${version} .
+	docker build --network host --build-arg=EMSCRIPTEN_VERSION=${version} --tag emscripten/emsdk:${version} .
 
 push: .TEST
 	docker push emscripten/emsdk:${version}
diff --git a/docker/README.md b/docker/README.md
index 5a72b8380b..7199de8dc9 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -59,6 +59,7 @@ This step will build Dockerfile as given tag on local machine
 ```bash
 # using docker
 docker build \
+    --network host \
     --build-arg=EMSCRIPTEN_VERSION=1.38.43-upstream \
     --tag emscripten/emsdk:1.38.43-upstream \
     .

From d371fb6ffc4720be6b02260300d82baa2b834327 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Fri, 5 Jun 2020 09:49:28 -0700
Subject: [PATCH 007/161] 1.39.17 (#518)

---
 emscripten-releases-tags.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index a416d20a74..1fd0568555 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "1.39.16",
+  "latest": "1.39.17",
   "releases": {
+    "1.39.17": "9bc968c0e49b1c795ecddb87391b265911e2adcb",
     "1.39.16": "ae5001fac3849895a873e422a2a80afc90f3b798",
     "1.39.15": "3880c744c068986d4ee781a61f7b2e820043e11f",
     "1.39.14": "574ad04affb82cc36a32dd89b2a87bea4fb30eba",

From 24d88487f47629fac9d4acd231497a3a412bdee8 Mon Sep 17 00:00:00 2001
From: Jonathan Hale <Squareys@googlemail.com>
Date: Sat, 6 Jun 2020 00:32:23 +0200
Subject: [PATCH 008/161] Set up build-docker-image job build docker image for
 tags on Circle CI (#513)

Signed-off-by: Squareys <squareys@googlemail.com>
---
 .circleci/config.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0b22c8f654..b35f707c46 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -90,6 +90,15 @@ jobs:
             source emsdk_env.sh
             python scripts/test.py
 
+  build-docker-image:
+    machine: true
+    steps:
+      - checkout
+      - run: cd docker && make version=${CIRCLE_TAG}-upstream
+      - run: |
+          docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
+          docker push emscripten/emsdk:${CIRCLE_TAG}-upstream
+
 workflows:
   flake8:
     jobs:
@@ -103,3 +112,11 @@ workflows:
   test-windows:
     jobs:
       - test-windows
+  build-docker-image:
+    jobs:
+      - build-docker-image:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /.*/

From 01589e7afd91ddd0989d655f539c9c4ade7f8e92 Mon Sep 17 00:00:00 2001
From: "Piotr Paczkowski (trzeci.eu)" <kontakt@trzeci.eu>
Date: Tue, 9 Jun 2020 17:36:37 +0200
Subject: [PATCH 009/161] Updated tagging schema for docker images (#519)

---
 .circleci/config.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b35f707c46..11f40b078c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -94,10 +94,12 @@ jobs:
     machine: true
     steps:
       - checkout
-      - run: cd docker && make version=${CIRCLE_TAG}-upstream
+      - run: docker build --network host --build-arg=EMSCRIPTEN_VERSION=${CIRCLE_TAG}-upstream --tag emscripten/emsdk:${CIRCLE_TAG} ./docker
+      - run: docker tag emscripten/emsdk:${CIRCLE_TAG} emscripten/emsdk:latest
       - run: |
           docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
-          docker push emscripten/emsdk:${CIRCLE_TAG}-upstream
+          docker push emscripten/emsdk:${CIRCLE_TAG}
+          docker push emscripten/emsdk:latest
 
 workflows:
   flake8:

From 27b23d467d5b8beb73d4d325b9a32c8eb77e8f95 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Fri, 12 Jun 2020 10:59:52 -0700
Subject: [PATCH 010/161] 1.39.18 (#521)

---
 emscripten-releases-tags.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 1fd0568555..cff62e4f8d 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "1.39.17",
+  "latest": "1.39.18",
   "releases": {
+    "1.39.18": "1914a1543f08cd8e41f44c2bb05f7a90d1920275",
     "1.39.17": "9bc968c0e49b1c795ecddb87391b265911e2adcb",
     "1.39.16": "ae5001fac3849895a873e422a2a80afc90f3b798",
     "1.39.15": "3880c744c068986d4ee781a61f7b2e820043e11f",

From 72410825954463fe2a7e1a78513010c41faac35b Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 22 Jun 2020 16:09:09 -0700
Subject: [PATCH 011/161] Build docker image as part of CI (#527)

We only publish on tag, but we want to build and test the image
on all PRs.
---
 .circleci/config.yml | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 11f40b078c..67ef717e36 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -91,15 +91,37 @@ jobs:
             python scripts/test.py
 
   build-docker-image:
-    machine: true
+    executor: bionic
+    steps:
+      - checkout
+      - run:
+          name: install docker
+          command: apt-get update -q && apt-get install -q -y docker.io
+      - setup_remote_docker
+      - run:
+          name: build
+          command: docker build --network host ./docker
+
+  publish-docker-image:
+    executor: bionic
     steps:
       - checkout
-      - run: docker build --network host --build-arg=EMSCRIPTEN_VERSION=${CIRCLE_TAG}-upstream --tag emscripten/emsdk:${CIRCLE_TAG} ./docker
-      - run: docker tag emscripten/emsdk:${CIRCLE_TAG} emscripten/emsdk:latest
-      - run: |
-          docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
-          docker push emscripten/emsdk:${CIRCLE_TAG}
-          docker push emscripten/emsdk:latest
+      - run:
+          name: install docker
+          command: apt-get update -q && apt-get install -q -y docker.io
+      - setup_remote_docker
+      - run:
+          name: build
+          command: docker build --network host --build-arg=EMSCRIPTEN_VERSION=${CIRCLE_TAG}-upstream --tag emscripten/emsdk:${CIRCLE_TAG} ./docker
+      - run:
+          name: tag image
+          command: docker tag emscripten/emsdk:${CIRCLE_TAG} emscripten/emsdk:latest
+      - run:
+          name: push image
+          command: |
+            docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
+            docker push emscripten/emsdk:${CIRCLE_TAG}
+            docker push emscripten/emsdk:latest
 
 workflows:
   flake8:
@@ -116,7 +138,8 @@ workflows:
       - test-windows
   build-docker-image:
     jobs:
-      - build-docker-image:
+      - build-docker-image
+      - publish-docker-image:
           filters:
             branches:
               ignore: /.*/

From d50b1d86f6895614d45109e9d375e9542dcb19e9 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 22 Jun 2020 17:19:12 -0700
Subject: [PATCH 012/161] Simplify docker image in several ways (#523)

- `--embeddded` mode is the now the default
- embedded cache and ports is also the default
- emsdk now fully polulates the cache by default so no need to do that.
- always "activate" the SDK avoiding that need things to work without
  that.
- avoid making extra symlinks.
- remove python2
---
 docker/Dockerfile          | 148 +++++++++----------------------------
 docker/entrypoint          |  27 -------
 docker/test_dockerimage.sh |   2 -
 3 files changed, 34 insertions(+), 143 deletions(-)
 delete mode 100755 docker/entrypoint

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a1a5363e5f..57eb6c41d8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,17 +3,11 @@ FROM debian:buster AS stage_build
 # ------------------------------------------------------------------------------
 
 # Supports only 1.38.40+, accepts also '-upstream' variants
-ARG EMSCRIPTEN_VERSION=1.39.11
-ARG EMSDK_CHANGESET=master
+ARG EMSCRIPTEN_VERSION=1.39.18
 
 # ------------------------------------------------------------------------------
 
-# NOTE: Any change of following variables should be reflected in ./entrypoint file
 ENV EMSDK /emsdk
-ENV EM_DATA ${EMSDK}/.data
-ENV EM_CONFIG ${EMSDK}/.emscripten
-ENV EM_CACHE ${EM_DATA}/cache
-ENV EM_PORTS ${EM_DATA}/ports
 
 # ------------------------------------------------------------------------------
 
@@ -28,70 +22,27 @@ RUN echo "## Start building" \
             ca-certificates \
             build-essential \
             file \
-            python python-pip \
             python3 python3-pip \
-    \
 &&  echo "## Done"
 
 RUN  echo "## Get EMSDK" \
     &&  git clone https://github.com/emscripten-core/emsdk.git ${EMSDK} \
-    &&  cd ${EMSDK} && git reset --hard ${EMSDK_CHANGESET} \
-    \
-    &&  ./emsdk.py update-tags \
 &&  echo "## Done"
 
 RUN  echo "## Install Emscripten" \
     &&  cd ${EMSDK} \
-    && ./emsdk install ${EMSCRIPTEN_VERSION} \
-    \
+    &&  ./emsdk install ${EMSCRIPTEN_VERSION} \
 &&  echo "## Done"
 
 # This generates configuration that contains all valid paths according to installed SDK
 RUN cd ${EMSDK} \
     &&  echo "## Generate standard configuration" \
-    \
-    &&  ./emsdk activate ${EMSCRIPTEN_VERSION} --embedded \
-    &&  ./emsdk construct_env > /dev/null \
+    &&  ./emsdk activate ${EMSCRIPTEN_VERSION} \
+    &&  ./emsdk construct_env \
     &&  cat ${EMSDK}/emsdk_set_env.sh \
-    \
-    # remove wrongly created entry with EM_CACHE, variable will be picked up from ENV
-    &&  sed -i -e "/EM_CACHE/d" ${EMSDK}/emsdk_set_env.sh \
-    # add a link to tools like asm2wasm in a system path
-    # asm2wasm (and friends might be places either in ./upstream of ./fastcomp folder, hence detection is needed)
-    &&  printf "export PATH=$(dirname $(find . -name asm2wasm -exec readlink -f {} +)):\$PATH\n" >> ${EMSDK}/emsdk_set_env.sh \
-    \
-&&  echo "## Done"
-
-# Create a structure and make mutable folders accessible for r/w
-RUN cd ${EMSDK} \
-    &&  echo "## Create .data structure" \
-    &&  for mutable_dir in ${EM_DATA} ${EM_PORTS} ${EM_CACHE} ${EMSDK}/zips ${EMSDK}/tmp; do \
-            mkdir -p ${mutable_dir}; \
-            chmod -R 777 ${mutable_dir}; \
-        done \
-        \
+    &&  chmod -R 777 ${EMSDK}/upstream/emscripten/cache \
 &&  echo "## Done"
 
-# Create an entrypoint that activates Emscripten SDK and helps running this image as non-root user
-COPY entrypoint ${EMSDK}/
-
-
-# Create symbolic links for critical Emscripten Tools
-# This is important for letting people using Emscripten in Dockerfiles without activation
-# As each Emscripten release is placed to a different folder (i.e. /emsdk/emscripten/tag-1.38.31)
-RUN echo "## Create symbolic links" \
-    &&  . ${EMSDK}/emsdk_set_env.sh \
-    \
-    &&  mkdir -p ${EMSDK}/llvm ${EMSDK}/emscripten ${EMSDK}/binaryen \
-    \
-    &&  ln -s $(dirname $(which node))/..       ${EMSDK}/node/current \
-    &&  ln -s $(dirname $(which clang))/..      ${EMSDK}/llvm/clang \
-    &&  ln -s $(dirname $(which emcc))          ${EMSDK}/emscripten/sdk \
-    \
-    &&  ln -s $(dirname $(which asm2wasm))      ${EMSDK}/binaryen/bin \
-    \
-    &&  echo "## Done"
-
 # Clean up emscripten installation and strip some symbols
 RUN echo "## Aggresive optimization: Remove debug symbols" \
 &&  apt-get -qq -y update && apt-get -qq install -y --no-install-recommends \
@@ -100,36 +51,21 @@ RUN echo "## Aggresive optimization: Remove debug symbols" \
     # Remove debugging symbols from embedded node (extra 7MB)
     && strip -s `which node` \
     # Tests consume ~80MB disc space
-    && rm -fr ${EMSDK}/llvm/clang/emscripten/tests \
+    && rm -fr ${EMSDK}/upstream/emscripten/tests \
     # strip out symbols from clang (~extra 50MB disc space)
-    && find ${EMSDK}/llvm/clang/bin -type f -exec strip -s {} + || true \
-    && find ${EMSDK}/llvm/clang/fastcomp/bin -type f -exec strip -s {} + || true \
+    && find ${EMSDK}/upstream/bin -type f -exec strip -s {} + || true \
+    && find ${EMSDK}/upstream/fastcomp/bin -type f -exec strip -s {} + || true \
 &&  echo "## Done"
 
-# Populate Emscripten SDK cache with libc++, to improve further compilation times.
-RUN echo "## Pre-populate cache" \
-    &&  . ${EMSDK}/emsdk_set_env.sh \
-    \
-    &&  embuilder.py build SYSTEM \
-    \
-    &&  mkdir -p /tmp/emscripten_test \
-    &&  cd /tmp/emscripten_test \
-    \
-        &&  printf '#include <iostream>\nint main(){std::cout << "HELLO FROM DOCKER C++"<<std::endl;return 0;}' > test.cpp \
-        &&  em++ --std=c++11 test.cpp -o test.js -s WASM=0 &&  node test.js \
-        &&  em++ --std=c++11 -g3 test.cpp -o test.js -s WASM=0 &&  node test.js \
-        &&  em++ --std=c++11 test.cpp -o test.js -s WASM=1 &&  node test.js \
-    \
-    &&  cd / \
-    &&  rm -fr /tmp/emscripten_test \
-    \
-    # some files were created, and we need to make sure that those can be accessed by non-root people
-    &&  chmod -R 777 ${EM_DATA} \
-    \
-    # cleanup
-    &&  find ${EMSDK} -name "*.pyc" -exec rm {} \; \
-    \
-    &&  echo "## Done"
+# Generate sanity
+# TODO(sbc): We should be able to use just emcc -v here but it doesn't
+# currently create the sanity file.
+RUN echo "## Generate sanity" \
+   &&  . ${EMSDK}/emsdk_set_env.sh \
+   &&  echo "int main() { return 0; }" > hello.c \
+   &&  emcc -c hello.c \
+   &&  cat ${EMSDK}/.emscripten_sanity \
+&&  echo "## Done"
 
 # ------------------------------------------------------------------------------
 # -------------------------------- STAGE DEPLOY --------------------------------
@@ -140,33 +76,26 @@ FROM debian:buster-slim AS stage_deploy
 COPY --from=stage_build /emsdk /emsdk
 
 # Fallback in case Emscripten isn't activated.
-# This will let use tools offered by this image inside other Docker images (sub-stages) or with custom / no entrypoint
-ENV EMSDK /emsdk
-ENV EMSCRIPTEN=${EMSDK}/emscripten/sdk
-
-ENV EM_DATA ${EMSDK}/.data
-ENV EM_CONFIG ${EMSDK}/.emscripten
-ENV EM_CACHE ${EM_DATA}/cache
-ENV EM_PORTS ${EM_DATA}/ports
-
-# Fallback in case Emscripten isn't activated
-# Expose Major tools to system PATH, so that emcc, node, asm2wasm etc can be used without activation
-ENV PATH="${EMSDK}:${EMSDK}/emscripten/sdk:${EMSDK}/llvm/clang/bin:${EMSDK}/node/current/bin:${EMSDK}/binaryen/bin:${PATH}"
-
-# Use entrypoint that's coming from emscripten-slim image. It sets all required system paths and variables
-ENTRYPOINT ["/emsdk/entrypoint"]
-
+# This will let use tools offered by this image inside other Docker images
+# (sub-stages) or with custom / no entrypoint
+ENV EMSDK_NODE=/emsdk/node/12.9.1_64bit/bin/node
+ENV EMSDK=/emsdk
+ENV EM_CONFIG=/emsdk/.emscripten
+ENV PATH="${EMSDK}:${EMSDK}/upstream/emscripten:${EMSDK}/upstream/bin:emsdk/node/12.9.1_64bit/bin:${PATH}"
 
 # ------------------------------------------------------------------------------
 # Create a 'standard` 1000:1000 user
-# Thanks to that this image can be executed as non-root user and created files will not require root access level on host machine
-# Please note that this solution even if widely spread (i.e. Node.js uses it) is far from perfect as user 1000:1000 might not exist on
-# host machine, and in this case running any docker image will cause other random problems (mostly due `$HOME` pointing to `/`)
-# This extra user works nicely with entrypoint provided in `/emsdk/entrypoint` as it detects case explained before.
+# Thanks to that this image can be executed as non-root user and created files
+# will not require root access level on host machine Please note that this
+# solution even if widely spread (i.e. Node.js uses it) is far from perfect as
+# user 1000:1000 might not exist on host machine, and in this case running any
+# docker image will cause other random problems (mostly due `$HOME` pointing to
+# `/`)
 RUN echo "## Create emscripten user (1000:1000)" \
     &&  groupadd --gid 1000 emscripten \
     &&  useradd --uid 1000 --gid emscripten --shell /bin/bash --create-home emscripten \
-    \
+    &&  echo "umask 0000" >> /etc/bash.bashrc \
+    &&  echo ". /emsdk/emsdk_set_env.sh" >> /etc/bash.bashrc \
 &&  echo "## Done"
 
 # ------------------------------------------------------------------------------
@@ -178,9 +107,7 @@ RUN echo "## Update and install packages" \
     &&  apt-get -qq -y update && apt-get -qq install -y --no-install-recommends \
         libxml2 \
         ca-certificates \
-        python \
         python3 \
-        python-pip \
         python3-pip \
         wget \
         curl \
@@ -208,17 +135,10 @@ RUN echo "## Update and install packages" \
 
 # ------------------------------------------------------------------------------
 # Internal test suite of tools that this image provides
-COPY test_dockerimage.sh ${EMSDK}/
+COPY test_dockerimage.sh /emsdk/
 
-RUN echo "## Internal Testing of image (activated)" \
-    &&  . ${EMSDK}/emsdk_set_env.sh \
-    &&  ${EMSDK}/test_dockerimage.sh  \
-    \
-&&  echo "## Done"
-
-RUN echo "## Internal Testing of image (not-activated)" \
-    &&  ${EMSDK}/test_dockerimage.sh  \
-    \
+RUN echo "## Internal Testing of image" \
+    &&  /emsdk/test_dockerimage.sh  \
 &&  echo "## Done"
 
 # ------------------------------------------------------------------------------
diff --git a/docker/entrypoint b/docker/entrypoint
deleted file mode 100755
index 8e7c702845..0000000000
--- a/docker/entrypoint
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# In case when mapped user id by `docker run -u` is not created inside docker image
-# The `$HOME` variable points to `/` - which prevents any tool to write to, as it requires root access
-# In such case we set `$HOME` to `/tmp` as it should r/w for everyone
-
-if [ "$HOME" = "/" ] ; then
-    export HOME=/tmp
-fi
-
-# In case of running as root, use `umask` to reduce problem of file permission on host
-if [ "$(id -g)" = "0" ] && [ "$(id -u)" = "0" ] ;
-then
-    umask 0000
-fi
-
-# Export this image specific Environment variables
-# Those variables are important to use dedicated folder for all cache and predefined config file
-export EM_CONFIG=/emsdk/.emscripten
-export EM_CACHE=/emsdk/.data/cache
-export EM_PORTS=/emsdk/.data/ports
-
-# Activate Emscripten SDK
-. ${EMSDK}/emsdk_set_env.sh
-
-# Evaluate a command that's coming after `docker run` / `docker exec`
-"$@"
diff --git a/docker/test_dockerimage.sh b/docker/test_dockerimage.sh
index 7f5cfbea75..901ee9287b 100755
--- a/docker/test_dockerimage.sh
+++ b/docker/test_dockerimage.sh
@@ -8,8 +8,6 @@ node --version
 npm --version
 python3 --version
 pip3 --version
-python --version
-pip --version
 em++ --version
 emcc --version
 java -version

From 8dd51b45e9723f1333d8c08b56d3f86c90ec9950 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 23 Jun 2020 17:59:46 -0700
Subject: [PATCH 013/161] Remove unused permanent in construct_env (#525)

This was only ever set to true if the user knew to pass an
undocumented extra argument called "perm".
---
 emsdk.py | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 660f86af0d..1a61294437 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2486,7 +2486,7 @@ def set_active_tools(tools_to_activate, permanently_activate):
 
   # Construct a .bat script that will be invoked to set env. vars and PATH
   if WINDOWS:
-    env_string = construct_env(tools_to_activate, False)
+    env_string = construct_env(tools_to_activate)
     open(EMSDK_SET_ENV, 'w').write(env_string)
 
   # Apply environment variables to global all users section.
@@ -2583,17 +2583,10 @@ def adjusted_path(tools_to_activate, log_additions=False, system_path_only=False
   return (separator.join(whole_path), new_emsdk_tools)
 
 
-def construct_env(tools_to_activate, permanent):
+def construct_env(tools_to_activate):
   env_string = ''
   newpath, added_path = adjusted_path(tools_to_activate)
 
-  # Dont permanently add to PATH, since this will break the whole system if there
-  # are more than 1024 chars in PATH.
-  # (SETX truncates to set only 1024 chars)
-  #  if permanent:
-  #    print('SETX PATH "' + newpath + '"')
-  #  else:
-
   # Don't bother setting the path if there are no changes.
   if os.environ['PATH'] != newpath:
     if POWERSHELL:
@@ -2643,10 +2636,7 @@ def construct_env(tools_to_activate, permanent):
       if POWERSHELL:
         env_string += '$env:' + key + '="' + value + '"\n'
       elif CMD:
-        if permanent:
-          env_string += 'SETX ' + key + ' "' + value + '"\n'
-        else:
-          env_string += 'SET ' + key + '=' + value + '\n'
+        env_string += 'SET ' + key + '=' + value + '\n'
       elif CSH:
         env_string += 'setenv ' + key + ' "' + value + '"\n'
       elif BASH:
@@ -3023,7 +3013,7 @@ def print_tools(t):
       outfile = sys.argv[2]
     tools_to_activate = currently_active_tools()
     tools_to_activate = process_tool_list(tools_to_activate, log_errors=True)
-    env_string = construct_env(tools_to_activate, len(sys.argv) >= 3 and 'perm' in sys.argv[2])
+    env_string = construct_env(tools_to_activate)
     open(outfile, 'w').write(env_string)
     if UNIX:
       os.chmod(outfile, 0o755)

From 38a270fa5c19e4974aab975e0e691fb1cba1d055 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 23 Jun 2020 18:00:22 -0700
Subject: [PATCH 014/161] Minor python cleanups. NFC. (#496)

---
 .flake8  |  1 +
 emsdk.py | 33 +++++++++++++++++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.flake8 b/.flake8
index 31829b56d9..b67d9c2198 100644
--- a/.flake8
+++ b/.flake8
@@ -6,6 +6,7 @@ ignore =
    E121, # Continuation line under-indented for hanging indent
    E722  # bare excepts
 exclude =
+  ./llvm
   ./gnu
   ./upstream
   ./fastcomp
diff --git a/emsdk.py b/emsdk.py
index 1a61294437..bfef8c7260 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -210,10 +210,14 @@ def vswhere(version):
     program_files = os.environ['ProgramFiles(x86)'] if 'ProgramFiles(x86)' in os.environ else os.environ['ProgramFiles']
     vswhere_path = os.path.join(program_files, 'Microsoft Visual Studio', 'Installer', 'vswhere.exe')
     output = json.loads(subprocess.check_output([vswhere_path, '-latest', '-version', '[%s.0,%s.0)' % (version, version + 1), '-requires', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64', '-property', 'installationPath', '-format', 'json']))
-    # Visual Studio 2017 Express is not included in the above search, and it does not have the VC.Tools.x86.x64 tool, so do a catch-all attempt as a fallback, to detect Express version.
-    if len(output) == 0:
+    # Visual Studio 2017 Express is not included in the above search, and it
+    # does not have the VC.Tools.x86.x64 tool, so do a catch-all attempt as a
+    # fallback, to detect Express version.
+    if not output:
       output = json.loads(subprocess.check_output([vswhere_path, '-latest', '-version', '[%s.0,%s.0)' % (version, version + 1), '-products', '*', '-property', 'installationPath', '-format', 'json']))
-    return str(output[0]['installationPath']) if len(output) > 0 else ''
+      if not output:
+        return ''
+    return str(output[0]['installationPath'])
   except Exception:
     return ''
 
@@ -1804,7 +1808,7 @@ def can_be_installed(self):
 
     if self.id == 'vs-tool':
       msbuild_dir = find_msbuild_dir()
-      if len(msbuild_dir) > 0:
+      if msbuild_dir:
         return True
       else:
         return "Visual Studio was not found!"
@@ -2501,7 +2505,7 @@ def set_active_tools(tools_to_activate, permanently_activate):
     if newpath != os.environ['PATH']:
       win_set_environment_variable('PATH', newpath, system=True)
 
-  if len(tools_to_activate) > 0:
+  if tools_to_activate:
     tools = [x for x in tools_to_activate if not x.is_sdk]
     print('\nSet the following tools as active:\n   ' + '\n   '.join(map(lambda x: str(x), tools)))
     print('')
@@ -2600,16 +2604,14 @@ def construct_env(tools_to_activate):
     else:
       assert False
 
-    if len(added_path) > 0:
+    if added_path:
       print('Adding directories to PATH:')
       for item in added_path:
         print('PATH += ' + item)
       print('')
 
-  env_vars_to_add = []
-
   # A core variable EMSDK points to the root of Emscripten SDK directory.
-  env_vars_to_add += [('EMSDK', to_unix_path(emsdk_path()))]
+  env_vars_to_add = [('EMSDK', to_unix_path(emsdk_path()))]
 
   em_config_path = os.path.normpath(dot_emscripten_path())
   if to_unix_path(os.environ.get('EM_CONFIG', '')) != to_unix_path(em_config_path):
@@ -2630,7 +2632,7 @@ def construct_env(tools_to_activate):
       if key not in os.environ or to_unix_path(os.environ[key]) != to_unix_path(value):
         env_vars_to_add += [(key, value)]
 
-  if len(env_vars_to_add) > 0:
+  if env_vars_to_add:
     print('Setting environment variables:')
     for key, value in env_vars_to_add:
       if POWERSHELL:
@@ -2644,7 +2646,6 @@ def construct_env(tools_to_activate):
       else:
         assert False
       print(key + ' = ' + value)
-    print('')
   return env_string
 
 
@@ -2921,7 +2922,7 @@ def installed_sdk_text(name):
     # function.
     has_partially_active_tools = [False]
 
-    if len(sdks) > 0:
+    if sdks:
       def find_sdks(needs_compilation):
         s = []
         for sdk in sdks:
@@ -2946,7 +2947,7 @@ def print_sdks(s):
       print('The following SDKs can be compiled from source:')
       print_sdks(find_sdks(True))
 
-    if len(tools) > 0:
+    if tools:
       def find_tools(needs_compilation):
         t = []
         for tool in tools:
@@ -3053,11 +3054,11 @@ def print_tools(t):
       if tool is None:
         return error_on_missing_tool(arg)
       tools_to_activate += [tool]
-    if len(tools_to_activate) == 0:
+    if not tools_to_activate:
       print('No tools/SDKs specified to activate! Usage:\n   emsdk activate tool/sdk1 [tool/sdk2] [...]')
       return 1
-    tools_to_activate = set_active_tools(tools_to_activate, permanently_activate=arg_global)
-    if len(tools_to_activate) == 0:
+    active_tools = set_active_tools(tools_to_activate, permanently_activate=arg_global)
+    if not active_tools:
       print('No tools/SDKs found to activate! Usage:\n   emsdk activate tool/sdk1 [tool/sdk2] [...]')
       return 1
     if WINDOWS and not arg_global:

From 25416b8ff7384a4958d29244f9ef5e6c8bf07ee0 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 23 Jun 2020 18:50:16 -0700
Subject: [PATCH 015/161] Testing circleci auto-publish of docker image (#531)

---
 .circleci/config.yml | 6 +++++-
 docker/Dockerfile    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 67ef717e36..68ef11d2c7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -112,7 +112,11 @@ jobs:
       - setup_remote_docker
       - run:
           name: build
-          command: docker build --network host --build-arg=EMSCRIPTEN_VERSION=${CIRCLE_TAG}-upstream --tag emscripten/emsdk:${CIRCLE_TAG} ./docker
+          # TESTING: using fixed EMSCRIPTEN_VERSION.  Will revert this as
+          # soon as we've published docker image autoamtically using a test
+          # tag.
+          #command: docker build --network host --build-arg EMSCRIPTEN_VERSION=${CIRCLE_TAG} --tag emscripten/emsdk:${CIRCLE_TAG} ./docker
+          command: docker build --network host --build-arg EMSCRIPTEN_VERSION=1.39.18 --tag emscripten/emsdk:1.39.18 ./docker
       - run:
           name: tag image
           command: docker tag emscripten/emsdk:${CIRCLE_TAG} emscripten/emsdk:latest
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 57eb6c41d8..1c1241bbdf 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:buster AS stage_build
 # ------------------------------------------------------------------------------
 
 # Supports only 1.38.40+, accepts also '-upstream' variants
-ARG EMSCRIPTEN_VERSION=1.39.18
+ARG EMSCRIPTEN_VERSION=1.39.17
 
 # ------------------------------------------------------------------------------
 

From 8e5b6d89864f63a08296dd874763caf79499fb8b Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 23 Jun 2020 18:56:12 -0700
Subject: [PATCH 016/161] More circleci testing (sorry)

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 68ef11d2c7..e1d1fd24ba 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -119,7 +119,7 @@ jobs:
           command: docker build --network host --build-arg EMSCRIPTEN_VERSION=1.39.18 --tag emscripten/emsdk:1.39.18 ./docker
       - run:
           name: tag image
-          command: docker tag emscripten/emsdk:${CIRCLE_TAG} emscripten/emsdk:latest
+          command: docker tag emscripten/emsdk:1.39.18 emscripten/emsdk:latest
       - run:
           name: push image
           command: |

From 618fcf36eee6722516c23d4a7f304fdf8f4c8e1b Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 23 Jun 2020 19:06:58 -0700
Subject: [PATCH 017/161] More circleci testing

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e1d1fd24ba..c709e3c3d6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -124,7 +124,7 @@ jobs:
           name: push image
           command: |
             docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
-            docker push emscripten/emsdk:${CIRCLE_TAG}
+            docker push emscripten/emsdk:1.39.18
             docker push emscripten/emsdk:latest
 
 workflows:

From dc740929277f46be7eb593ee9da6d12bd5c85e24 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 23 Jun 2020 20:35:53 -0700
Subject: [PATCH 018/161] Revert testing changes

---
 .circleci/config.yml | 10 +++-------
 docker/Dockerfile    |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c709e3c3d6..67ef717e36 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -112,19 +112,15 @@ jobs:
       - setup_remote_docker
       - run:
           name: build
-          # TESTING: using fixed EMSCRIPTEN_VERSION.  Will revert this as
-          # soon as we've published docker image autoamtically using a test
-          # tag.
-          #command: docker build --network host --build-arg EMSCRIPTEN_VERSION=${CIRCLE_TAG} --tag emscripten/emsdk:${CIRCLE_TAG} ./docker
-          command: docker build --network host --build-arg EMSCRIPTEN_VERSION=1.39.18 --tag emscripten/emsdk:1.39.18 ./docker
+          command: docker build --network host --build-arg=EMSCRIPTEN_VERSION=${CIRCLE_TAG}-upstream --tag emscripten/emsdk:${CIRCLE_TAG} ./docker
       - run:
           name: tag image
-          command: docker tag emscripten/emsdk:1.39.18 emscripten/emsdk:latest
+          command: docker tag emscripten/emsdk:${CIRCLE_TAG} emscripten/emsdk:latest
       - run:
           name: push image
           command: |
             docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
-            docker push emscripten/emsdk:1.39.18
+            docker push emscripten/emsdk:${CIRCLE_TAG}
             docker push emscripten/emsdk:latest
 
 workflows:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1c1241bbdf..57eb6c41d8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:buster AS stage_build
 # ------------------------------------------------------------------------------
 
 # Supports only 1.38.40+, accepts also '-upstream' variants
-ARG EMSCRIPTEN_VERSION=1.39.17
+ARG EMSCRIPTEN_VERSION=1.39.18
 
 # ------------------------------------------------------------------------------
 

From c08015164e861fba388648f1547e0cd8a46d768c Mon Sep 17 00:00:00 2001
From: Derek Schuff <dschuff@chromium.org>
Date: Wed, 24 Jun 2020 10:41:47 -0700
Subject: [PATCH 019/161] Update nodejs to v12.18.1 (#529)

It includes an update to v8 7.8
---
 emsdk_manifest.json    | 48 +++++++++++++++++++++---------------------
 scripts/test.py        |  6 +++---
 scripts/update_node.py |  2 +-
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 2814d12972..9815cdfe48 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -188,42 +188,42 @@
   },
   {
     "id": "node",
-    "version": "12.9.1",
+    "version": "12.18.1",
     "bitness": 32,
     "arch": "x86",
-    "windows_url": "node-v12.9.1-win-x86.zip",
+    "windows_url": "node-v12.18.1-win-x86.zip",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
     "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
   },
   {
     "id": "node",
-    "version": "12.9.1",
+    "version": "12.18.1",
     "arch": "arm",
     "bitness": 32,
-    "linux_url": "node-v12.9.1-linux-armv7l.tar.xz",
+    "linux_url": "node-v12.18.1-linux-armv7l.tar.xz",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
     "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
   },
   {
     "id": "node",
-    "version": "12.9.1",
+    "version": "12.18.1",
     "bitness": 64,
     "arch": "x86_64",
-    "osx_url": "node-v12.9.1-darwin-x64.tar.gz",
-    "windows_url": "node-v12.9.1-win-x64.zip",
-    "linux_url": "node-v12.9.1-linux-x64.tar.xz",
+    "osx_url": "node-v12.18.1-darwin-x64.tar.gz",
+    "windows_url": "node-v12.18.1-win-x64.zip",
+    "linux_url": "node-v12.18.1-linux-x64.tar.xz",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
     "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
   },
   {
     "id": "node",
-    "version": "12.9.1",
+    "version": "12.18.1",
     "arch": "aarch64",
     "bitness": 64,
-    "linux_url": "node-v12.9.1-linux-arm64.tar.xz",
+    "linux_url": "node-v12.18.1-linux-arm64.tar.xz",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
     "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
@@ -469,19 +469,19 @@
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "win"
   },
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "osx"
   },
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "linux"
   },
   {
@@ -493,31 +493,31 @@
   {
     "version": "fastcomp-master",
     "bitness": 32,
-    "uses": ["fastcomp-clang-master-32bit", "node-12.9.1-32bit", "python-3.7.4-32bit", "java-8.152-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
+    "uses": ["fastcomp-clang-master-32bit", "node-12.18.1-32bit", "python-3.7.4-32bit", "java-8.152-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
     "os": "win"
   },
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-12.9.1-64bit", "python-3.7.4-64bit", "java-8.152-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "java-8.152-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "win"
   },
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-12.9.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "osx"
   },
   {
     "version": "fastcomp-master",
     "bitness": 32,
-    "uses": ["fastcomp-clang-master-32bit", "node-12.9.1-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
+    "uses": ["fastcomp-clang-master-32bit", "node-12.18.1-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
     "os": "linux"
   },
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-12.9.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "linux"
   },
   {
@@ -559,42 +559,42 @@
   {
     "version": "releases-upstream-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.9.1-64bit", "releases-upstream-%releases-tag%-64bit"],
+    "uses": ["node-12.18.1-64bit", "releases-upstream-%releases-tag%-64bit"],
     "os": "linux",
     "custom_install_script": "emscripten_npm_install"
   },
   {
     "version": "releases-upstream-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.9.1-64bit", "releases-upstream-%releases-tag%-64bit"],
+    "uses": ["node-12.18.1-64bit", "releases-upstream-%releases-tag%-64bit"],
     "os": "osx",
     "custom_install_script": "emscripten_npm_install"
   },
   {
     "version": "releases-upstream-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.9.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
+    "uses": ["node-12.18.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
     "os": "win",
     "custom_install_script": "emscripten_npm_install"
   },
   {
     "version": "releases-fastcomp-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.9.1-64bit", "releases-fastcomp-%releases-tag%-64bit"],
+    "uses": ["node-12.18.1-64bit", "releases-fastcomp-%releases-tag%-64bit"],
     "os": "linux",
     "custom_install_script": "emscripten_npm_install"
   },
   {
     "version": "releases-fastcomp-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.9.1-64bit", "releases-fastcomp-%releases-tag%-64bit"],
+    "uses": ["node-12.18.1-64bit", "releases-fastcomp-%releases-tag%-64bit"],
     "os": "osx",
     "custom_install_script": "emscripten_npm_install"
   },
   {
     "version": "releases-fastcomp-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.9.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-fastcomp-%releases-tag%-64bit"],
+    "uses": ["node-12.18.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-fastcomp-%releases-tag%-64bit"],
     "os": "win",
     "custom_install_script": "emscripten_npm_install"
   },
diff --git a/scripts/test.py b/scripts/test.py
index d8c3b01c4b..ba8d96fd68 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -157,9 +157,9 @@ def run_emsdk(cmd):
 
 # Test the normal tools like node don't re-download on re-install
 print('another install must re-download')
-checked_call_with_output(emsdk + ' uninstall node-12.9.1-64bit')
-checked_call_with_output(emsdk + ' install node-12.9.1-64bit', expected='Downloading:', unexpected='already installed')
-checked_call_with_output(emsdk + ' install node-12.9.1-64bit', unexpected='Downloading:', expected='already installed')
+checked_call_with_output(emsdk + ' uninstall node-12.18.1-64bit')
+checked_call_with_output(emsdk + ' install node-12.18.1-64bit', expected='Downloading:', unexpected='already installed')
+checked_call_with_output(emsdk + ' install node-12.18.1-64bit', unexpected='Downloading:', expected='already installed')
 
 print('test tot-upstream')
 run_emsdk('install tot-upstream')
diff --git a/scripts/update_node.py b/scripts/update_node.py
index b0e778d370..765f20678d 100755
--- a/scripts/update_node.py
+++ b/scripts/update_node.py
@@ -16,7 +16,7 @@
 import os
 import shutil
 
-version = '12.16.3'
+version = '12.18.1'
 base = 'https://nodejs.org/dist/latest-v12.x/'
 upload_base = 'gs://webassembly/emscripten-releases-builds/deps/'
 

From 47c669a002821061c223f3f29ff28657a86b5d66 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Wed, 24 Jun 2020 15:12:58 -0700
Subject: [PATCH 020/161] Update node directory in Dockerfile (#532)

---
 docker/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 57eb6c41d8..22bc87c45d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -78,10 +78,10 @@ COPY --from=stage_build /emsdk /emsdk
 # Fallback in case Emscripten isn't activated.
 # This will let use tools offered by this image inside other Docker images
 # (sub-stages) or with custom / no entrypoint
-ENV EMSDK_NODE=/emsdk/node/12.9.1_64bit/bin/node
+ENV EMSDK_NODE=/emsdk/node/12.18.1_64bit/bin/node
 ENV EMSDK=/emsdk
 ENV EM_CONFIG=/emsdk/.emscripten
-ENV PATH="${EMSDK}:${EMSDK}/upstream/emscripten:${EMSDK}/upstream/bin:emsdk/node/12.9.1_64bit/bin:${PATH}"
+ENV PATH="${EMSDK}:${EMSDK}/upstream/emscripten:${EMSDK}/upstream/bin:emsdk/node/12.18.1_64bit/bin:${PATH}"
 
 # ------------------------------------------------------------------------------
 # Create a 'standard` 1000:1000 user

From eff1d2e2f1379253133aaeed5533cfdc699f8db7 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Wed, 24 Jun 2020 16:55:32 -0700
Subject: [PATCH 021/161] Drop "-upstream" suffix from docker image name (#530)

---
 .circleci/config.yml | 2 +-
 docker/Dockerfile    | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 67ef717e36..47653df56a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -112,7 +112,7 @@ jobs:
       - setup_remote_docker
       - run:
           name: build
-          command: docker build --network host --build-arg=EMSCRIPTEN_VERSION=${CIRCLE_TAG}-upstream --tag emscripten/emsdk:${CIRCLE_TAG} ./docker
+          command: docker build --network host --build-arg EMSCRIPTEN_VERSION=${CIRCLE_TAG} --tag emscripten/emsdk:${CIRCLE_TAG} ./docker
       - run:
           name: tag image
           command: docker tag emscripten/emsdk:${CIRCLE_TAG} emscripten/emsdk:latest
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 22bc87c45d..3c9c07a1d6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,12 +1,6 @@
 FROM debian:buster AS stage_build
 
-# ------------------------------------------------------------------------------
-
-# Supports only 1.38.40+, accepts also '-upstream' variants
 ARG EMSCRIPTEN_VERSION=1.39.18
-
-# ------------------------------------------------------------------------------
-
 ENV EMSDK /emsdk
 
 # ------------------------------------------------------------------------------
@@ -52,9 +46,10 @@ RUN echo "## Aggresive optimization: Remove debug symbols" \
     && strip -s `which node` \
     # Tests consume ~80MB disc space
     && rm -fr ${EMSDK}/upstream/emscripten/tests \
+    # Fastcomp is not supported
+    && rm -fr ${EMSDK}/upstream/fastcomp \
     # strip out symbols from clang (~extra 50MB disc space)
     && find ${EMSDK}/upstream/bin -type f -exec strip -s {} + || true \
-    && find ${EMSDK}/upstream/fastcomp/bin -type f -exec strip -s {} + || true \
 &&  echo "## Done"
 
 # Generate sanity

From 7f77b615c2f7c4db24cb4717a20dd020db30a748 Mon Sep 17 00:00:00 2001
From: "Piotr Paczkowski (trzeci.eu)" <kontakt@trzeci.eu>
Date: Sat, 27 Jun 2020 01:51:21 +0200
Subject: [PATCH 022/161] Add standard workdir for Dockerimage (#534)

As requested by @curiousdannii in https://github.com/trzecieu/emscripten-docker/issues/58#issuecomment-648760800
---
 docker/Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3c9c07a1d6..6f47d7ea68 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -140,6 +140,10 @@ RUN echo "## Internal Testing of image" \
 # Copy this Dockerimage into image, so that it will be possible to recreate it later
 COPY Dockerfile /emsdk/dockerfiles/emscripten-core/emsdk/
 
+# ------------------------------------------------------------------------------
+# Use commonly used /src as working directory
+WORKDIR /src
+
 LABEL maintainer="kontakt@trzeci.eu" \
       org.label-schema.name="emscripten" \
       org.label-schema.description="The official container with Emscripten SDK" \

From 92d512faa832b3ff5d6b8bc991b6801e31d8e372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=ED=83=9C=EC=9E=AC=EC=98=81?= <tjy970721@gmail.com>
Date: Thu, 2 Jul 2020 13:37:54 +0900
Subject: [PATCH 023/161] docs: change message when running emsdk_env.sh (#537)

---
 emsdk.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index bfef8c7260..2bf839ea97 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -1509,7 +1509,8 @@ def generate_dot_emscripten(active_tools):
     emsdk_env = os.path.relpath(sdk_path('emsdk_env.sh'))
     if '/' not in emsdk_env:
       emsdk_env = './emsdk_env.sh'
-    print("To conveniently access the selected set of tools from the command line, consider adding the following directories to PATH, or call 'source " + emsdk_env + "' to do this for you.")
+    print("To conveniently access the selected set of tools from the command line, consider adding the following directories to PATH.")
+    print("Or call 'source " + emsdk_env + "' to do this for you. (Add these in your bashrc or other startup scripts to have these permanently available)")
     print('')
     print('   ' + ENVPATH_SEPARATOR.join(path_add))
 

From 819e95cd995147d8b16c600d64e16c880cc407df Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 6 Jul 2020 16:34:02 -0700
Subject: [PATCH 024/161] Cleanup emsdk_env scripts (#539)

Remove the optional argument to contruct_env.  It simple if we
always construct the env in the same place.  Avoid using temp files,
and avoid changing directory.
---
 emsdk.py       | 33 ++++++++++++++++++---------------
 emsdk_env.bat  |  2 +-
 emsdk_env.csh  | 11 ++++-------
 emsdk_env.fish |  8 ++------
 emsdk_env.ps1  |  2 +-
 emsdk_env.sh   | 21 ++++++++-------------
 6 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 2bf839ea97..1f1d85ba97 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2490,6 +2490,9 @@ def set_active_tools(tools_to_activate, permanently_activate):
   copy_pregenerated_cache(tools_to_activate)
 
   # Construct a .bat script that will be invoked to set env. vars and PATH
+  # We only do this on windows since emsdk.bat is able to modify the
+  # calling shell environment.  On other platform `source emsdk_env.sh` is
+  # required.
   if WINDOWS:
     env_string = construct_env(tools_to_activate)
     open(EMSDK_SET_ENV, 'w').write(env_string)
@@ -2612,11 +2615,11 @@ def construct_env(tools_to_activate):
       print('')
 
   # A core variable EMSDK points to the root of Emscripten SDK directory.
-  env_vars_to_add = [('EMSDK', to_unix_path(emsdk_path()))]
+  env_vars = [('EMSDK', to_unix_path(emsdk_path()))]
 
   em_config_path = os.path.normpath(dot_emscripten_path())
   if to_unix_path(os.environ.get('EM_CONFIG', '')) != to_unix_path(em_config_path):
-    env_vars_to_add += [('EM_CONFIG', em_config_path)]
+    env_vars += [('EM_CONFIG', em_config_path)]
 
   for tool in tools_to_activate:
     config = tool.activated_config()
@@ -2624,14 +2627,18 @@ def construct_env(tools_to_activate):
       # For older emscripten versions that don't use this default we export
       # EM_CACHE.
       em_cache_dir = os.path.join(config['EMSCRIPTEN_ROOT'], 'cache')
-      env_vars_to_add += [('EM_CACHE', em_cache_dir)]
+      env_vars += [('EM_CACHE', em_cache_dir)]
     envs = tool.activated_environment()
     for env in envs:
       key, value = parse_key_value(env)
       value = to_native_path(tool.expand_vars(value))
-      # Don't set env vars which are already set to the correct value.
-      if key not in os.environ or to_unix_path(os.environ[key]) != to_unix_path(value):
-        env_vars_to_add += [(key, value)]
+      env_vars += [(key, value)]
+
+  # Don't set env vars which are already set to the correct value.
+  env_vars_to_add = []
+  for key, value in env_vars:
+    if key not in os.environ or to_unix_path(os.environ[key]) != to_unix_path(value):
+      env_vars_to_add.append((key, value))
 
   if env_vars_to_add:
     print('Setting environment variables:')
@@ -3006,19 +3013,15 @@ def print_tools(t):
 
     return 0
   elif cmd == 'construct_env':
-    if len(sys.argv) == 2:
-      outfile = EMSDK_SET_ENV
-      # Clean up old temp file up front, in case of failure later before we get
-      # to write out the new one.
-      silentremove(EMSDK_SET_ENV)
-    else:
-      outfile = sys.argv[2]
+    # Clean up old temp file up front, in case of failure later before we get
+    # to write out the new one.
+    silentremove(EMSDK_SET_ENV)
     tools_to_activate = currently_active_tools()
     tools_to_activate = process_tool_list(tools_to_activate, log_errors=True)
     env_string = construct_env(tools_to_activate)
-    open(outfile, 'w').write(env_string)
+    open(EMSDK_SET_ENV, 'w').write(env_string)
     if UNIX:
-      os.chmod(outfile, 0o755)
+      os.chmod(EMSDK_SET_ENV, 0o755)
     return 0
   elif cmd == 'update':
     update_emsdk()
diff --git a/emsdk_env.bat b/emsdk_env.bat
index 1f8d1650bb..c793321c98 100644
--- a/emsdk_env.bat
+++ b/emsdk_env.bat
@@ -1 +1 @@
-@call "%~dp0emsdk" construct_env %*
+@call "%~dp0emsdk" construct_env
diff --git a/emsdk_env.csh b/emsdk_env.csh
index 54cdf0e902..7987a3ba63 100755
--- a/emsdk_env.csh
+++ b/emsdk_env.csh
@@ -21,16 +21,13 @@ else
   set SRC="$SRC[2]"
 endif
 set CURDIR=`pwd`
-cd `dirname "$SRC"`
+set DIR=`dirname "$SRC"`
 unset SRC
 
 setenv EMSDK_CSH 1
 
-set tmpfile=`mktemp` || exit 1
-./emsdk construct_env $tmpfile
-source $tmpfile
-rm -f $tmpfile
+$DIR/emsdk construct_env
+source $DIR/emsdk_set_env.csh
+unset DIR
 
 unsetenv EMSDK_CSH
-
-cd "$CURDIR"
diff --git a/emsdk_env.fish b/emsdk_env.fish
index 99119b73eb..e4aea0608d 100755
--- a/emsdk_env.fish
+++ b/emsdk_env.fish
@@ -6,12 +6,8 @@
 set -l script (status -f)
 set -l dir (dirname $script)
 
-pushd $dir > /dev/null
-
-./emsdk construct_env
-. ./emsdk_set_env.sh
+$dir/emsdk construct_env
+. $dir/emsdk_set_env.sh
 
 set -e -l script
 set -e -l dir
-
-popd > /dev/null
diff --git a/emsdk_env.ps1 b/emsdk_env.ps1
index fc7f2c7692..ab5fc4dc45 100644
--- a/emsdk_env.ps1
+++ b/emsdk_env.ps1
@@ -1,2 +1,2 @@
 $ScriptDirectory = Split-Path -parent $PSCommandPath
-& "$ScriptDirectory/emsdk.ps1" construct_env $args
+& "$ScriptDirectory/emsdk.ps1" construct_env
diff --git a/emsdk_env.sh b/emsdk_env.sh
index 1e972a3541..9c0a5c771d 100755
--- a/emsdk_env.sh
+++ b/emsdk_env.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This script is sourced by the user and uses
 # their shell. Try not to use bashisms.
 
@@ -15,18 +15,13 @@
 #     ./emsdk_env.sh
 #
 # which won't have any effect.
-SRC="$BASH_SOURCE"
-if [ "$SRC" = "" ]; then
-  SRC="$0"
+DIR="$BASH_SOURCE"
+if [ "$DIR" = "" ]; then
+  DIR="$0"
 fi
-CURDIR="$(pwd)"
-cd "$(dirname "$SRC")"
-unset SRC
+DIR="$(dirname "$DIR")"
 
-tmpfile=`mktemp` || exit 1
 # Force emsdk to use bash syntax so that this works in windows + bash too
-EMSDK_BASH=1 ./emsdk construct_env $tmpfile
-. $tmpfile
-rm -f $tmpfile
-
-cd "$CURDIR"
+EMSDK_BASH=1 $DIR/emsdk construct_env
+. $DIR/emsdk_set_env.sh
+unset DIR

From 4f2daec0741fa42239e8225a747f7d636f57f55b Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 7 Jul 2020 09:03:43 -0700
Subject: [PATCH 025/161] Fix running emsdk_env.sh outside of emsdk directory
 (#541)

Fixes: #540
---
 emsdk.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 1f1d85ba97..61c7e39f5e 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -170,10 +170,18 @@ def emsdk_path():
 if os.path.exists(os.path.join(emsdk_path(), '.emscripten')):
   emscripten_config_directory = emsdk_path()
 
-EMSDK_SET_ENV = 'emsdk_set_env.ps1' if POWERSHELL \
-    else 'emsdk_set_env.bat' if (WINDOWS and not MSYS) \
-    else 'emsdk_set_env.csh' if CSH \
-    else 'emsdk_set_env.sh'
+
+def get_set_env_script_name():
+  if POWERSHELL:
+    return 'emsdk_set_env.ps1'
+  if WINDOWS and not MSYS:
+    return 'emsdk_set_env.bat'
+  if CSH:
+    return 'emsdk_set_env.csh'
+  return 'emsdk_set_env.sh'
+
+
+EMSDK_SET_ENV = os.path.join(emsdk_path(), get_set_env_script_name())
 
 ARCHIVE_SUFFIXES = ('zip', '.tar', '.gz', '.xz', '.tbz2', '.bz2')
 

From 833dfddcdc013951c1d8d0bb0538d276b4026c1c Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Tue, 7 Jul 2020 10:04:10 -0700
Subject: [PATCH 026/161] 1.39.19 (#542)

---
 emscripten-releases-tags.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index cff62e4f8d..0c32abb22b 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "1.39.18",
+  "latest": "1.39.19",
   "releases": {
+    "1.39.19": "665121d026cafc46c29b30d6d4c45ed73eedbb7e",
     "1.39.18": "1914a1543f08cd8e41f44c2bb05f7a90d1920275",
     "1.39.17": "9bc968c0e49b1c795ecddb87391b265911e2adcb",
     "1.39.16": "ae5001fac3849895a873e422a2a80afc90f3b798",

From d37abed2de63f2e24d020cdcd64845b74ac1b50a Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 10 Jul 2020 17:49:16 -0700
Subject: [PATCH 027/161] Avoid writing to file in emsdk_env.csh / emsdk_env.sh
 (#544)

This is an alternative fix for
https://github.com/emscripten-core/emscripten/issues/9090 which recently
came up again after #539.

Tested with bash, tcsh and fish.
---
 .gitignore     |  3 +--
 emsdk.py       | 58 ++++++++++++++++++++++++--------------------------
 emsdk_env.csh  | 11 ++++------
 emsdk_env.fish |  3 +--
 emsdk_env.sh   |  3 +--
 5 files changed, 35 insertions(+), 43 deletions(-)
 mode change 100755 => 100644 emsdk_env.csh
 mode change 100755 => 100644 emsdk_env.fish
 mode change 100755 => 100644 emsdk_env.sh

diff --git a/.gitignore b/.gitignore
index 75afb979b6..db399b89cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,9 +9,8 @@ __pycache__
 /.emscripten_sanity
 /.emscripten_sanity_wasm
 
-# Auto-generated by `active`
+# Auto-generated by emsdk.py under windows by `construct_env` or `activate`
 /emsdk_set_env.bat
-/emsdk_set_env.sh
 
 # Tags files that get generated at runtime
 /emscripten-releases-tot.txt
diff --git a/emsdk.py b/emsdk.py
index 61c7e39f5e..197f37070e 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -96,7 +96,6 @@
 else:
   ENVPATH_SEPARATOR = ':'
 
-
 ARCH = 'unknown'
 # platform.machine() may return AMD64 on windows, so standardize the case.
 machine = platform.machine().lower()
@@ -170,18 +169,7 @@ def emsdk_path():
 if os.path.exists(os.path.join(emsdk_path(), '.emscripten')):
   emscripten_config_directory = emsdk_path()
 
-
-def get_set_env_script_name():
-  if POWERSHELL:
-    return 'emsdk_set_env.ps1'
-  if WINDOWS and not MSYS:
-    return 'emsdk_set_env.bat'
-  if CSH:
-    return 'emsdk_set_env.csh'
-  return 'emsdk_set_env.sh'
-
-
-EMSDK_SET_ENV = os.path.join(emsdk_path(), get_set_env_script_name())
+EMSDK_SET_ENV = os.path.join(emsdk_path(), 'emsdk_set_env.bat')
 
 ARCHIVE_SUFFIXES = ('zip', '.tar', '.gz', '.xz', '.tbz2', '.bz2')
 
@@ -2479,6 +2467,11 @@ def copy_pregenerated_cache(tools_to_activate):
                      os.path.join(out_cache, filename))
 
 
+def write_set_env_bat(env_string):
+  assert(WINDOWS)
+  open(EMSDK_SET_ENV, 'w').write(env_string)
+
+
 # Reconfigure .emscripten to choose the currently activated toolset, set PATH
 # and other environment variables.
 # Returns the full list of deduced tools that are now active.
@@ -2503,7 +2496,7 @@ def set_active_tools(tools_to_activate, permanently_activate):
   # required.
   if WINDOWS:
     env_string = construct_env(tools_to_activate)
-    open(EMSDK_SET_ENV, 'w').write(env_string)
+    write_set_env_bat(env_string)
 
   # Apply environment variables to global all users section.
   if WINDOWS and permanently_activate:
@@ -2599,6 +2592,10 @@ def adjusted_path(tools_to_activate, log_additions=False, system_path_only=False
   return (separator.join(whole_path), new_emsdk_tools)
 
 
+def log_stderr(msg):
+  sys.stderr.write(str(msg) + '\n')
+
+
 def construct_env(tools_to_activate):
   env_string = ''
   newpath, added_path = adjusted_path(tools_to_activate)
@@ -2610,17 +2607,17 @@ def construct_env(tools_to_activate):
     elif CMD:
       env_string += 'SET PATH=' + newpath + '\n'
     elif CSH:
-      env_string += 'setenv PATH "' + newpath + '"\n'
+      env_string += 'setenv PATH "' + newpath + '";\n'
     elif BASH:
-      env_string += 'export PATH="' + newpath + '"\n'
+      env_string += 'export PATH="' + newpath + '";\n'
     else:
       assert False
 
     if added_path:
-      print('Adding directories to PATH:')
+      log_stderr('Adding directories to PATH:')
       for item in added_path:
-        print('PATH += ' + item)
-      print('')
+        log_stderr('PATH += ' + item)
+      log_stderr('')
 
   # A core variable EMSDK points to the root of Emscripten SDK directory.
   env_vars = [('EMSDK', to_unix_path(emsdk_path()))]
@@ -2649,19 +2646,19 @@ def construct_env(tools_to_activate):
       env_vars_to_add.append((key, value))
 
   if env_vars_to_add:
-    print('Setting environment variables:')
+    log_stderr('Setting environment variables:')
     for key, value in env_vars_to_add:
       if POWERSHELL:
         env_string += '$env:' + key + '="' + value + '"\n'
       elif CMD:
         env_string += 'SET ' + key + '=' + value + '\n'
       elif CSH:
-        env_string += 'setenv ' + key + ' "' + value + '"\n'
+        env_string += 'setenv ' + key + ' "' + value + '";\n'
       elif BASH:
-        env_string += 'export ' + key + '="' + value + '"\n'
+        env_string += 'export ' + key + '="' + value + '";\n'
       else:
         assert False
-      print(key + ' = ' + value)
+      log_stderr(key + ' = ' + value)
   return env_string
 
 
@@ -3023,19 +3020,20 @@ def print_tools(t):
   elif cmd == 'construct_env':
     # Clean up old temp file up front, in case of failure later before we get
     # to write out the new one.
-    silentremove(EMSDK_SET_ENV)
     tools_to_activate = currently_active_tools()
     tools_to_activate = process_tool_list(tools_to_activate, log_errors=True)
     env_string = construct_env(tools_to_activate)
-    open(EMSDK_SET_ENV, 'w').write(env_string)
-    if UNIX:
-      os.chmod(EMSDK_SET_ENV, 0o755)
+    if WINDOWS and not BASH:
+      write_set_env_bat(env_string)
+    else:
+      sys.stdout.write(env_string)
     return 0
   elif cmd == 'update':
     update_emsdk()
-    # Clean up litter after old emsdk update which may have left this temp file
-    # around.
-    silentremove(sdk_path(EMSDK_SET_ENV))
+    if WINDOWS:
+      # Clean up litter after old emsdk update which may have left this temp
+      # file around.
+      silentremove(sdk_path(EMSDK_SET_ENV))
     return 0
   elif cmd == 'update-tags':
     fetch_emscripten_tags()
diff --git a/emsdk_env.csh b/emsdk_env.csh
old mode 100755
new mode 100644
index 7987a3ba63..187d4c5438
--- a/emsdk_env.csh
+++ b/emsdk_env.csh
@@ -5,8 +5,6 @@
 # because it won't have any effect then.
 # That is, always run this script with
 #
-#     . ./emsdk_env.csh
-# or
 #     source ./emsdk_env.csh
 #
 # instead of just plainly running with
@@ -18,16 +16,15 @@ set SRC=($_)
 if ("$SRC" == "") then
   set SRC="$0"
 else
-  set SRC="$SRC[2]"
+  set SRC="$SRC[1]"
 endif
 set CURDIR=`pwd`
-set DIR=`dirname "$SRC"`
+setenv DIR `dirname "$SRC"`
 unset SRC
 
 setenv EMSDK_CSH 1
 
-$DIR/emsdk construct_env
-source $DIR/emsdk_set_env.csh
-unset DIR
+eval `$DIR/emsdk construct_env`
+unsetenv DIR
 
 unsetenv EMSDK_CSH
diff --git a/emsdk_env.fish b/emsdk_env.fish
old mode 100755
new mode 100644
index e4aea0608d..29f6f4647b
--- a/emsdk_env.fish
+++ b/emsdk_env.fish
@@ -6,8 +6,7 @@
 set -l script (status -f)
 set -l dir (dirname $script)
 
-$dir/emsdk construct_env
-. $dir/emsdk_set_env.sh
+eval ($dir/emsdk construct_env)
 
 set -e -l script
 set -e -l dir
diff --git a/emsdk_env.sh b/emsdk_env.sh
old mode 100755
new mode 100644
index 9c0a5c771d..d78dfff518
--- a/emsdk_env.sh
+++ b/emsdk_env.sh
@@ -22,6 +22,5 @@ fi
 DIR="$(dirname "$DIR")"
 
 # Force emsdk to use bash syntax so that this works in windows + bash too
-EMSDK_BASH=1 $DIR/emsdk construct_env
-. $DIR/emsdk_set_env.sh
+eval `EMSDK_BASH=1 $DIR/emsdk construct_env`
 unset DIR

From c494899c17d481a019fb6aaa5b8191231f19768e Mon Sep 17 00:00:00 2001
From: Walt <32001362+Walt280@users.noreply.github.com>
Date: Sat, 11 Jul 2020 10:38:17 -0400
Subject: [PATCH 028/161] Change EMSDK_SET_ENV to output correct filename for
 powershell. (#546)

Rename write_set_env_bat to write_set_env_script.
---
 emsdk.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 197f37070e..7ac39dd5de 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -169,7 +169,11 @@ def emsdk_path():
 if os.path.exists(os.path.join(emsdk_path(), '.emscripten')):
   emscripten_config_directory = emsdk_path()
 
-EMSDK_SET_ENV = os.path.join(emsdk_path(), 'emsdk_set_env.bat')
+EMSDK_SET_ENV = ""
+if POWERSHELL:
+  EMSDK_SET_ENV = os.path.join(emsdk_path(), 'emsdk_set_env.ps1')
+else:
+  EMSDK_SET_ENV = os.path.join(emsdk_path(), 'emsdk_set_env.bat')
 
 ARCHIVE_SUFFIXES = ('zip', '.tar', '.gz', '.xz', '.tbz2', '.bz2')
 
@@ -2467,7 +2471,7 @@ def copy_pregenerated_cache(tools_to_activate):
                      os.path.join(out_cache, filename))
 
 
-def write_set_env_bat(env_string):
+def write_set_env_script(env_string):
   assert(WINDOWS)
   open(EMSDK_SET_ENV, 'w').write(env_string)
 
@@ -2496,7 +2500,7 @@ def set_active_tools(tools_to_activate, permanently_activate):
   # required.
   if WINDOWS:
     env_string = construct_env(tools_to_activate)
-    write_set_env_bat(env_string)
+    write_set_env_script(env_string)
 
   # Apply environment variables to global all users section.
   if WINDOWS and permanently_activate:
@@ -3024,7 +3028,7 @@ def print_tools(t):
     tools_to_activate = process_tool_list(tools_to_activate, log_errors=True)
     env_string = construct_env(tools_to_activate)
     if WINDOWS and not BASH:
-      write_set_env_bat(env_string)
+      write_set_env_script(env_string)
     else:
       sys.stdout.write(env_string)
     return 0

From 9f63f10ab673a71e63f6db755b3e6c991c6a6a7a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sat, 11 Jul 2020 20:44:40 -0700
Subject: [PATCH 029/161] Fix fatal exception in "emsdk list" on unsupported
 platforms (#549)

On platforms with no supported binary SDKs to download, find_sdk
can return None which caused a check in the "list" command to fail.
Checking for the return value before making method calls fixes this,
and allows Linux/ARM64 to run "emsdk list" and then build an SDK
from source.

Fixes https://github.com/emscripten-core/emsdk/issues/548
---
 emsdk.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index 7ac39dd5de..52429407cb 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2907,7 +2907,8 @@ def extract_bool_arg(name):
     print('')
 
     def installed_sdk_text(name):
-      return 'INSTALLED' if find_sdk(name).is_installed() else ''
+      sdk = find_sdk(name)
+      return 'INSTALLED' if sdk and sdk.is_installed() else ''
 
     if (LINUX or OSX or WINDOWS) and (ARCH == 'x86' or ARCH == 'x86_64'):
       print('The *recommended* precompiled SDK download is %s (%s).' % (find_latest_releases_version(), find_latest_releases_hash()))

From 96ba7f6a73bddfc6ed7352b383e074ed2f1b2932 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 14 Jul 2020 15:58:42 -0700
Subject: [PATCH 030/161] Remove bash-ism from emsdk_env.sh (#552)

This is a because its not possible to determine the location
of as script that is currently being sources under a POSIX shell
such as dash (the default ubuntu shell).  Only bash has this
special BASH_SCRIPT variable.
---
 emsdk_env.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/emsdk_env.sh b/emsdk_env.sh
index d78dfff518..2b57fda3ec 100644
--- a/emsdk_env.sh
+++ b/emsdk_env.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
 # This script is sourced by the user and uses
 # their shell. Try not to use bashisms.
 
@@ -15,11 +14,14 @@
 #     ./emsdk_env.sh
 #
 # which won't have any effect.
-DIR="$BASH_SOURCE"
-if [ "$DIR" = "" ]; then
-  DIR="$0"
+if [ -z "$BASH_SOURCE" ]; then
+  if [ ! -f "./emsdk.py" ]; then
+    echo "error: You must be in the same directory as emsdk_env.sh when sourcing it (or switch to the bash shell)" 1>&2
+  fi
+  DIR="."
+else
+  DIR="$(dirname "$BASH_SOURCE")"
 fi
-DIR="$(dirname "$DIR")"
 
 # Force emsdk to use bash syntax so that this works in windows + bash too
 eval `EMSDK_BASH=1 $DIR/emsdk construct_env`

From d4383f4767348a4a1a4aa10d81cde2260aedebdb Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 14 Jul 2020 16:22:16 -0700
Subject: [PATCH 031/161] Fix docker build to not depend on emsdk_set_env.sh
 (#554)

This was an internal script that we used to generate up
until #544.   Now we avoid writing that file at all and
emsdk_env.sh is instead sourced directly.

This should fix the docker CI issues we have been having.
---
 docker/Dockerfile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6f47d7ea68..a01ddbceaf 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -32,8 +32,6 @@ RUN  echo "## Install Emscripten" \
 RUN cd ${EMSDK} \
     &&  echo "## Generate standard configuration" \
     &&  ./emsdk activate ${EMSCRIPTEN_VERSION} \
-    &&  ./emsdk construct_env \
-    &&  cat ${EMSDK}/emsdk_set_env.sh \
     &&  chmod -R 777 ${EMSDK}/upstream/emscripten/cache \
 &&  echo "## Done"
 
@@ -41,7 +39,7 @@ RUN cd ${EMSDK} \
 RUN echo "## Aggresive optimization: Remove debug symbols" \
 &&  apt-get -qq -y update && apt-get -qq install -y --no-install-recommends \
         binutils \
-    && . ${EMSDK}/emsdk_set_env.sh \
+    && cd ${EMSDK} && . ./emsdk_env.sh \
     # Remove debugging symbols from embedded node (extra 7MB)
     && strip -s `which node` \
     # Tests consume ~80MB disc space
@@ -56,7 +54,7 @@ RUN echo "## Aggresive optimization: Remove debug symbols" \
 # TODO(sbc): We should be able to use just emcc -v here but it doesn't
 # currently create the sanity file.
 RUN echo "## Generate sanity" \
-   &&  . ${EMSDK}/emsdk_set_env.sh \
+   &&  cd ${EMSDK} && . ./emsdk_env.sh \
    &&  echo "int main() { return 0; }" > hello.c \
    &&  emcc -c hello.c \
    &&  cat ${EMSDK}/.emscripten_sanity \
@@ -90,7 +88,7 @@ RUN echo "## Create emscripten user (1000:1000)" \
     &&  groupadd --gid 1000 emscripten \
     &&  useradd --uid 1000 --gid emscripten --shell /bin/bash --create-home emscripten \
     &&  echo "umask 0000" >> /etc/bash.bashrc \
-    &&  echo ". /emsdk/emsdk_set_env.sh" >> /etc/bash.bashrc \
+    &&  echo ". /emsdk/emsdk_env.sh" >> /etc/bash.bashrc \
 &&  echo "## Done"
 
 # ------------------------------------------------------------------------------

From e5f63be5a4253b53bca620d4e24b43d41b917b13 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 14 Jul 2020 17:32:47 -0700
Subject: [PATCH 032/161] Update location emsdk_set_env.bat in emsdk.bat (#553)

The location of this file is now fixed to living inside the
emsdk directory, not the current working directory.
---
 emsdk.bat | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/emsdk.bat b/emsdk.bat
index 3a95825e52..0decd1dc94 100644
--- a/emsdk.bat
+++ b/emsdk.bat
@@ -42,10 +42,10 @@
 
 @set EMSDK_PY=
 
-:: python is not able to set environment variables to the parent calling process, so
-:: therefore have it craft a .bat file, which we invoke after finishing python execution,
-:: to set up the environment variables
-@IF EXIST emsdk_set_env.bat (
-  @CALL emsdk_set_env.bat > NUL
-  @DEL /F /Q emsdk_set_env.bat
+:: python is not able to set environment variables to the parent calling
+:: process, so therefore have it craft a .bat file, which we invoke after
+:: finishing python execution, to set up the environment variables
+@IF EXIST "%~dp0\emsdk_set_env.bat" (
+  @CALL "%~dp0\emsdk_set_env.bat" > NUL
+  @DEL /F /Q "%~dp0\emsdk_set_env.bat"
 )

From dec8a63594753fe5f4ad3b47850bf64d66c14a4e Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Wed, 15 Jul 2020 11:39:24 -0700
Subject: [PATCH 033/161] Remove emsdk_set_ene.bat from .gitignore (#550)

This file should only ever exist momentarily.  Its written during
`emsdk construct_env` on windows, but emsdk.bat immediately uses
at deletes it before returning.

Having this file remain around on disk would be a bug so we shouldn't
ignore its presense.
---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index db399b89cc..229c0b6ba9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,9 +9,6 @@ __pycache__
 /.emscripten_sanity
 /.emscripten_sanity_wasm
 
-# Auto-generated by emsdk.py under windows by `construct_env` or `activate`
-/emsdk_set_env.bat
-
 # Tags files that get generated at runtime
 /emscripten-releases-tot.txt
 

From 3e9f04d467ba300b43fc40dab657c56f39751c96 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 20 Jul 2020 13:39:21 -0700
Subject: [PATCH 034/161] Remove support for non-embedded mode (#510)

embedded mode as been the default since #472 and I included
`--no-embedded` as an option during the interim time, but to simply
the code and avoid have two modes of operation I think its safe
to now remove the non-embedded mode.
---
 emsdk.py | 76 ++++++++++++++++----------------------------------------
 1 file changed, 22 insertions(+), 54 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 52429407cb..5e5852bdb4 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -20,7 +20,6 @@
 import subprocess
 import sys
 import sysconfig
-import tempfile
 import zipfile
 
 if sys.version_info >= (3,):
@@ -164,11 +163,6 @@ def emsdk_path():
   return to_unix_path(os.path.dirname(os.path.realpath(__file__)))
 
 
-emscripten_config_directory = os.path.expanduser("~/")
-# If .emscripten exists, we are configuring as embedded inside the emsdk directory.
-if os.path.exists(os.path.join(emsdk_path(), '.emscripten')):
-  emscripten_config_directory = emsdk_path()
-
 EMSDK_SET_ENV = ""
 if POWERSHELL:
   EMSDK_SET_ENV = os.path.join(emsdk_path(), 'emsdk_set_env.ps1')
@@ -1409,7 +1403,7 @@ def get_required_path(active_tools):
 # Returns the absolute path to the file '.emscripten' for the current user on
 # this system.
 def dot_emscripten_path():
-  return os.path.join(emscripten_config_directory, ".emscripten")
+  return os.path.join(emsdk_path(), ".emscripten")
 
 
 dot_emscripten = {}
@@ -1445,20 +1439,11 @@ def load_dot_emscripten():
 
 
 def generate_dot_emscripten(active_tools):
-  global emscripten_config_directory
-  if emscripten_config_directory == emsdk_path():
-    temp_dir = sdk_path('tmp')
-    mkdir_p(temp_dir)
-    embedded = True
-  else:
-    temp_dir = tempfile.gettempdir().replace('\\', '/')
-    embedded = False
+  temp_dir = sdk_path('tmp')
+  mkdir_p(temp_dir)
 
-  cfg = ''
-
-  if embedded:
-    cfg += 'import os\n'
-    cfg += "emsdk_path = os.path.dirname(os.environ.get('EM_CONFIG')).replace('\\\\', '/')\n"
+  cfg = 'import os\n'
+  cfg += "emsdk_path = os.path.dirname(os.environ.get('EM_CONFIG')).replace('\\\\', '/')\n"
 
   # Different tools may provide the same activated configs; the latest to be
   # activated is the relevant one.
@@ -1482,8 +1467,7 @@ def generate_dot_emscripten(active_tools):
 JS_ENGINES = [NODE_JS]
 ''' % temp_dir
 
-  if embedded:
-    cfg = cfg.replace("'" + emscripten_config_directory, "emsdk_path + '")
+  cfg = cfg.replace("'" + emsdk_path(), "emsdk_path + '")
 
   if os.path.exists(dot_emscripten_path()):
     backup_path = dot_emscripten_path() + ".old"
@@ -1495,7 +1479,7 @@ def generate_dot_emscripten(active_tools):
 
   # Clear old emscripten content.
   try:
-    os.remove(os.path.join(emscripten_config_directory, ".emscripten_sanity"))
+    os.remove(os.path.join(emsdk_path(), ".emscripten_sanity"))
   except:
     pass
 
@@ -1758,8 +1742,8 @@ def is_active(self):
         debug_print(str(self) + ' is not active, because key="' + key + '" does not exist in .emscripten')
         return False
 
-      # If running in embedded mode, all paths are stored dynamically relative
-      # to the emsdk root, so normalize those first.
+      # all paths are stored dynamically relative to the emsdk root, so
+      # normalize those first.
       dot_emscripten_key = dot_emscripten[key].replace("emsdk_path + '", "'" + emsdk_path())
       dot_emscripten_key = dot_emscripten_key.strip("'")
       if dot_emscripten_key != value:
@@ -2683,7 +2667,7 @@ def error_on_missing_tool(name):
 
 
 def main():
-  global emscripten_config_directory, BUILD_FOR_TESTING, ENABLE_LLVM_ASSERTIONS, TTY_OUTPUT
+  global BUILD_FOR_TESTING, ENABLE_LLVM_ASSERTIONS, TTY_OUTPUT
 
   if len(sys.argv) <= 1:
     print("Missing command; Type 'emsdk help' to get a list of commands.")
@@ -2768,18 +2752,13 @@ def main():
 
     if WINDOWS:
       print('''
-   emsdk activate [--global] [--[no-]embedded] [--build=type] [--vs2017/--vs2019] <tool/sdk>
+   emsdk activate [--global] [--build=type] [--vs2017/--vs2019] <tool/sdk>
 
                                 - Activates the given tool or SDK in the
                                   environment of the current shell. If the
                                   --global option is passed, the registration
                                   is done globally to all users in the system
-                                  environment. In embedded mode (the default)
-                                  all Emcripten configuration files as well as
-                                  the temp, cache and ports directories
-                                  are located inside the Emscripten SDK
-                                  directory rather than the user home
-                                  directory. If a custom compiler version was
+                                  environment.  If a custom compiler version was
                                   used to override the compiler to use, pass
                                   the same --vs2017/--vs2019 parameter
                                   here to choose which version to activate.
@@ -2787,15 +2766,10 @@ def main():
    emcmdprompt.bat              - Spawns a new command prompt window with the
                                   Emscripten environment active.''')
     else:
-      print('''   emsdk activate [--[no-]embedded] [--build=type] <tool/sdk>
+      print('''   emsdk activate [--build=type] <tool/sdk>
 
                                 - Activates the given tool or SDK in the
-                                  environment of the current shell. In
-                                  embedded mode (the default), all Emcripten
-                                  configuration files as well as the temp, cache
-                                  and ports directories are located inside the
-                                  Emscripten SDK directory rather than the user
-                                  home directory.''')
+                                  environment of the current shell.''')
 
     print('''
        Both commands 'install' and 'activate' accept an optional parameter
@@ -2817,8 +2791,12 @@ def extract_bool_arg(name):
   arg_old = extract_bool_arg('--old')
   arg_uses = extract_bool_arg('--uses')
   arg_global = extract_bool_arg('--global')
-  arg_embedded = extract_bool_arg('--embedded')
-  arg_embedded = not extract_bool_arg('--no-embedded')
+  if extract_bool_arg('--embedded'):
+    print('embedded mode is now the only mode available', file=sys.stderr)
+  if extract_bool_arg('--no-embedded'):
+    print('embedded mode is now the only mode available', file=sys.stderr)
+    return 1
+
   arg_notty = extract_bool_arg('--notty')
   if arg_notty:
     TTY_OUTPUT = False
@@ -3047,18 +3025,8 @@ def print_tools(t):
     if arg_global:
       print('Registering active Emscripten environment globally for all users.')
       print('')
-    if arg_embedded:
-      # Activating the emsdk tools locally relative to Emscripten SDK directory.
-      emscripten_config_directory = emsdk_path()
-      print('Writing .emscripten configuration file to Emscripten SDK directory ' + emscripten_config_directory)
-    else:
-      print('Writing .emscripten configuration file to user home directory ' + emscripten_config_directory)
-      # Remove .emscripten from emsdk dir, since its presence is used to detect
-      # whether emsdk is activate in embedded mode or not.
-      try:
-        os.remove(os.path.join(emsdk_path(), ".emscripten"))
-      except:
-        pass
+
+    print('Writing .emscripten configuration file in ' + emsdk_path())
 
     tools_to_activate = currently_active_tools()
     args = [x for x in sys.argv[2:] if not x.startswith('--')]

From 9d1b5b6d7da71a7938c8bf1dc0d3bc6332237a66 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 20 Jul 2020 14:25:09 -0700
Subject: [PATCH 035/161] Cleanup and unify code for removing files.  (#557)

---
 emsdk.py | 48 +++++++++++-------------------------------------
 1 file changed, 11 insertions(+), 37 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 5e5852bdb4..3a7a5fae73 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -268,7 +268,8 @@ def cmake_generator_prefix():
   return ''
 
 
-# Removes a directory tree even if it was readonly, and doesn't throw exception on failure.
+# Removes a directory tree even if it was readonly, and doesn't throw exception
+# on failure.
 def remove_tree(d):
   debug_print('remove_tree(' + str(d) + ')')
   if not os.path.exists(d):
@@ -591,10 +592,7 @@ def unzip(source_filename, dest_dir, unpack_even_if_exists=False):
             move_with_overwrite(fix_potentially_long_windows_pathname(dst_filename), fix_potentially_long_windows_pathname(final_dst_filename))
 
       if common_subdir:
-        try:
-          remove_tree(unzip_to_dir)
-        except:
-          pass
+        remove_tree(unzip_to_dir)
   except zipfile.BadZipfile as e:
     print("Unzipping file '" + source_filename + "' failed due to reason: " + str(e) + "! Removing the corrupted zip file.")
     rmfile(source_filename)
@@ -1208,11 +1206,7 @@ def uninstall_optimizer(tool):
   debug_print('uninstall_optimizer(' + str(tool) + ')')
   build_root = optimizer_build_root(tool)
   print("Deleting path '" + build_root + "'")
-  try:
-    remove_tree(build_root)
-    os.remove(build_root)
-  except:
-    pass
+  remove_tree(build_root)
 
 
 def is_optimizer_installed(tool):
@@ -1298,11 +1292,7 @@ def uninstall_binaryen(tool):
   debug_print('uninstall_binaryen(' + str(tool) + ')')
   build_root = binaryen_build_root(tool)
   print("Deleting path '" + build_root + "'")
-  try:
-    remove_tree(build_root)
-    os.remove(build_root)
-  except:
-    pass
+  remove_tree(build_root)
 
 
 def is_binaryen_installed(tool):
@@ -1469,6 +1459,7 @@ def generate_dot_emscripten(active_tools):
 
   cfg = cfg.replace("'" + emsdk_path(), "emsdk_path + '")
 
+  print('Writing configuration file: ' + dot_emscripten_path())
   if os.path.exists(dot_emscripten_path()):
     backup_path = dot_emscripten_path() + ".old"
     print("Backing up old Emscripten configuration file in " + os.path.normpath(backup_path))
@@ -1478,12 +1469,9 @@ def generate_dot_emscripten(active_tools):
     text_file.write(cfg)
 
   # Clear old emscripten content.
-  try:
-    os.remove(os.path.join(emsdk_path(), ".emscripten_sanity"))
-  except:
-    pass
+  rmfile(os.path.join(emsdk_path(), ".emscripten_sanity"))
 
-  print("The Emscripten configuration file " + os.path.normpath(dot_emscripten_path()) + " has been rewritten with the following contents:")
+  print("Configuration file contents:")
   print('')
   print(cfg.strip())
   print('')
@@ -1935,12 +1923,8 @@ def uninstall(self):
         uninstall_binaryen(self)
       else:
         raise Exception('Unknown custom_uninstall_script directive "' + self.custom_uninstall_script + '"!')
-    try:
-      print("Deleting path '" + self.installation_path() + "'")
-      remove_tree(self.installation_path())
-      os.remove(self.installation_path())
-    except:
-      pass
+    print("Deleting path '" + self.installation_path() + "'")
+    remove_tree(self.installation_path())
     print("Done uninstalling '" + str(self) + "'.")
 
   def dependencies(self):
@@ -2650,14 +2634,6 @@ def construct_env(tools_to_activate):
   return env_string
 
 
-def silentremove(filename):
-  try:
-    os.remove(filename)
-  except OSError as e:
-    if e.errno != errno.ENOENT:
-      raise
-
-
 def error_on_missing_tool(name):
   if name.endswith('-64bit') and not is_os_64bit():
     print("Error: '%s' is only provided for 64-bit OSes." % name)
@@ -3016,7 +2992,7 @@ def print_tools(t):
     if WINDOWS:
       # Clean up litter after old emsdk update which may have left this temp
       # file around.
-      silentremove(sdk_path(EMSDK_SET_ENV))
+      rmfile(sdk_path(EMSDK_SET_ENV))
     return 0
   elif cmd == 'update-tags':
     fetch_emscripten_tags()
@@ -3026,8 +3002,6 @@ def print_tools(t):
       print('Registering active Emscripten environment globally for all users.')
       print('')
 
-    print('Writing .emscripten configuration file in ' + emsdk_path())
-
     tools_to_activate = currently_active_tools()
     args = [x for x in sys.argv[2:] if not x.startswith('--')]
     for arg in args:

From b504f0ba3ad703fca96bc284cf242788b45e9566 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 20 Jul 2020 14:47:25 -0700
Subject: [PATCH 036/161] Cleanup legacy 'copy_pregenerated_cache' handling.
 NFC. (#558)

---
 emsdk.py | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 3a7a5fae73..f680a6381e 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2406,6 +2406,11 @@ def run_emcc(tools_to_activate):
 # in the correct location.
 # TODO(sbc): Remove this code.
 def copy_pregenerated_cache(tools_to_activate):
+  tools_with_cache = [t for t in tools_to_activate if hasattr(t, 'pregenerated_cache')]
+  if not tools_with_cache:
+    debug_print('Not copying pregenerated libaries (none found)')
+    return
+
   em_cache_dir = None
 
   # First look through all the tools to find the EMSCRIPTEN_ROOT
@@ -2418,13 +2423,18 @@ def copy_pregenerated_cache(tools_to_activate):
     debug_print('Not copying pregenerated libaries (no EMSCRIPTEN_ROOT found)')
     return
 
+  # Generating .emscripten will cause emcc to clear the cache on first run (emcc
+  # sees that the file has changed, since we write it here in the emsdk, and it
+  # never saw it before; so it clears the cache as it assumes a new config file
+  # means system libraries may need rebuilding). To avoid emcc's clearing wiping
+  # out the pregenerated cache contents we want to copy in, run emcc here, then
+  # copy the cache contents.
+  run_emcc(tools_to_activate)
+
   # If we found an EMSCRIPTEN_ROOT look for any tools that include
   # "pregenerated_cache" and copy those items into the cache.
-  for tool in tools_to_activate:
-    pregenerated_cache = getattr(tool, 'pregenerated_cache', None)
-    if not pregenerated_cache:
-      continue
-    for cache_dir in pregenerated_cache:
+  for tool in tools_with_cache:
+    for cache_dir in tool.pregenerated_cache:
       # Finish the install of an emscripten-releases build.
       install_path = to_native_path(sdk_path(tool.expand_vars(tool.install_path)))
       in_cache = os.path.join(install_path, 'lib', cache_dir)
@@ -2452,14 +2462,6 @@ def set_active_tools(tools_to_activate, permanently_activate):
 
   generate_dot_emscripten(tools_to_activate)
 
-  # Generating .emscripten will cause emcc to clear the cache on first run (emcc
-  # sees that the file has changed, since we write it here in the emsdk, and it
-  # never saw it before; so it clears the cache as it assumes a new config file
-  # means system libraries may need rebuilding). To avoid emcc's clearing wiping
-  # out the pregenerated cache contents we want to copy in, run emcc here, then
-  # copy the cache contents.
-  run_emcc(tools_to_activate)
-
   copy_pregenerated_cache(tools_to_activate)
 
   # Construct a .bat script that will be invoked to set env. vars and PATH

From 3249417955d99eb36f92769e3a4f96b134d97326 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Mon, 20 Jul 2020 15:36:09 -0700
Subject: [PATCH 037/161] 1.39.20 (#556)

---
 emscripten-releases-tags.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 0c32abb22b..bba8c717ee 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "1.39.19",
+  "latest": "1.39.20",
   "releases": {
+    "1.39.20": "e7e39da9c81faecd9ecf44065cee864d76e4e34d",
     "1.39.19": "665121d026cafc46c29b30d6d4c45ed73eedbb7e",
     "1.39.18": "1914a1543f08cd8e41f44c2bb05f7a90d1920275",
     "1.39.17": "9bc968c0e49b1c795ecddb87391b265911e2adcb",

From d8984b2a9d526229e3bdb304981e6fa2ea928328 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 20 Jul 2020 17:33:54 -0700
Subject: [PATCH 038/161] Rename build_llvm_monorepo to just build_llvm. NFC.
 (#560)

And build_llvm_fastcomp to just build_fastcomp (matches its name
in the json file.
---
 emsdk.py            | 19 ++++++++++---------
 emsdk_manifest.json |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index f680a6381e..dc6892af04 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -1038,8 +1038,8 @@ def xcode_sdk_version():
     return subprocess.checkplatform.mac_ver()[0].split('.')
 
 
-def build_llvm_fastcomp(tool):
-  debug_print('build_llvm_fastcomp(' + str(tool) + ')')
+def build_fastcomp(tool):
+  debug_print('build_fastcomp(' + str(tool) + ')')
   fastcomp_root = tool.installation_path()
   fastcomp_src_root = os.path.join(fastcomp_root, 'src')
   # Does this tool want to be git cloned from github?
@@ -1123,9 +1123,10 @@ def build_llvm_fastcomp(tool):
   return success
 
 
-# LLVM git source tree migrated to a single repository instead of multiple ones, build_llvm_monorepo() builds via that repository structure
-def build_llvm_monorepo(tool):
-  debug_print('build_llvm_monorepo(' + str(tool) + ')')
+# LLVM git source tree migrated to a single repository instead of multiple
+# ones, build_llvm() builds via that repository structure
+def build_llvm(tool):
+  debug_print('build_llvm(' + str(tool) + ')')
   llvm_root = tool.installation_path()
   llvm_src_root = os.path.join(llvm_root, 'src')
   success = git_clone_checkout_and_pull(tool.download_url(), llvm_src_root, tool.git_branch)
@@ -1841,9 +1842,9 @@ def install_tool(self):
     url = self.download_url()
 
     if hasattr(self, 'custom_install_script') and self.custom_install_script == 'build_fastcomp':
-      success = build_llvm_fastcomp(self)
-    elif hasattr(self, 'custom_install_script') and self.custom_install_script == 'build_llvm_monorepo':
-      success = build_llvm_monorepo(self)
+      success = build_fastcomp(self)
+    elif hasattr(self, 'custom_install_script') and self.custom_install_script == 'build_llvm':
+      success = build_llvm(self)
     elif hasattr(self, 'git_branch'):
       success = git_clone_checkout_and_pull(url, self.installation_path(), self.git_branch)
     elif url.endswith(ARCHIVE_SUFFIXES):
@@ -1869,7 +1870,7 @@ def install_tool(self):
           success = emscripten_post_install(self)
         elif self.custom_install_script == 'emscripten_npm_install':
           success = emscripten_npm_install(self, self.installation_path())
-        elif self.custom_install_script in ('build_fastcomp', 'build_llvm_monorepo'):
+        elif self.custom_install_script in ('build_fastcomp', 'build_llvm'):
           # 'build_fastcomp' is a special one that does the download on its
           # own, others do the download manually.
           pass
diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 9815cdfe48..970c0cb319 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -7,7 +7,7 @@
     "install_path": "llvm/git",
     "git_branch": "master",
     "url": "https://github.com/llvm/llvm-project.git",
-    "custom_install_script": "build_llvm_monorepo",
+    "custom_install_script": "build_llvm",
     "only_supports_wasm": true,
     "activated_path": "%installation_dir%/%fastcomp_build_bin_dir%",
     "activated_cfg": "LLVM_ROOT='%installation_dir%/%fastcomp_build_bin_dir%'",
@@ -21,7 +21,7 @@
     "install_path": "llvm/git",
     "git_branch": "master",
     "url": "https://github.com/llvm/llvm-project.git",
-    "custom_install_script": "build_llvm_monorepo",
+    "custom_install_script": "build_llvm",
     "only_supports_wasm": true,
     "activated_path": "%installation_dir%/%fastcomp_build_bin_dir%",
     "activated_cfg": "LLVM_ROOT='%installation_dir%/%fastcomp_build_bin_dir%'",

From 4aa028017ccee7dcacd28bcbccf4b00954f29024 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 21 Jul 2020 10:21:02 -0700
Subject: [PATCH 039/161] Use bundled/embedded python3 binary on OSX (#561)

See https://github.com/emscripten-core/emscripten/issues/7198
---
 .circleci/config.yml     |  3 --
 emsdk                    | 16 +++++-----
 emsdk_manifest.json      | 22 ++++++++++----
 scripts/test.sh          |  3 ++
 scripts/update_python.py | 63 ++++++++++++++++++++++++++++++++--------
 5 files changed, 78 insertions(+), 29 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 47653df56a..f4a2db283e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,9 +54,6 @@ jobs:
       - run:
           name: Install cmake
           command: brew install cmake
-      - run:
-          name: Install python 3
-          command: brew install python3
       - run: scripts/test.sh
       - run:
           name: test.py
diff --git a/emsdk b/emsdk
index 6859b5458b..eb24599419 100755
--- a/emsdk
+++ b/emsdk
@@ -6,13 +6,13 @@
 
 # Wrapper script that runs emsdk.py
 
-base_dir=$(dirname "$0")
-
-# Look for python3 first.  This is especially important on macOS (See:
-# https://github.com/emscripten-core/emsdk/pull/273)
-python=$(which python3 2> /dev/null)
-if [ $? != 0 ]; then
-  python=python
+if [ -z "$EMSDK_PYTHON" ]; then
+  # Look for python3 first.  This is especially important on macOS (See:
+  # https://github.com/emscripten-core/emsdk/pull/273)
+  EMSDK_PYTHON=$(which python3 2> /dev/null)
+  if [ $? != 0 ]; then
+    EMSDK_PYTHON=python
+  fi
 fi
 
-exec "$python" "$0.py" "$@"
+exec "$EMSDK_PYTHON" "$0.py" "$@"
diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 970c0cb319..50e524eff7 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -288,6 +288,16 @@
     "activated_cfg": "PYTHON='%installation_dir%/python.exe'",
     "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
   },
+  {
+    "id": "python",
+    "version": "3.7.4",
+    "bitness": 64,
+    "arch": "x86_64",
+    "osx_url": "python-3.7.4-macos.tar.gz",
+    "activated_path": "%installation_dir%/bin",
+    "activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
+    "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3"
+  },
   {
     "id": "java",
     "version": "8.152",
@@ -475,7 +485,7 @@
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "osx"
   },
   {
@@ -505,7 +515,7 @@
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "osx"
   },
   {
@@ -566,7 +576,7 @@
   {
     "version": "releases-upstream-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.18.1-64bit", "releases-upstream-%releases-tag%-64bit"],
+    "uses": ["node-12.18.1-64bit", "python-3.7.4-64bit", "releases-upstream-%releases-tag%-64bit"],
     "os": "osx",
     "custom_install_script": "emscripten_npm_install"
   },
@@ -587,7 +597,7 @@
   {
     "version": "releases-fastcomp-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.18.1-64bit", "releases-fastcomp-%releases-tag%-64bit"],
+    "uses": ["node-12.18.1-64bit", "python-3.7.4-64bit", "releases-fastcomp-%releases-tag%-64bit"],
     "os": "osx",
     "custom_install_script": "emscripten_npm_install"
   },
@@ -637,7 +647,7 @@
   {
     "version": "fastcomp-%precompiled_tag32%",
     "bitness": 32,
-    "uses": ["fastcomp-clang-e%precompiled_tag32%-32bit", "node-8.9.1-32bit", "emscripten-%precompiled_tag32%"],
+    "uses": ["fastcomp-clang-e%precompiled_tag32%-32bit", "node-8.9.1-32bit", "python-3.7.4-64bit", "emscripten-%precompiled_tag32%"],
     "os": "osx",
     "version_filter": [
       ["%precompiled_tag32%", ">", "1.37.22"]
@@ -646,7 +656,7 @@
   {
     "version": "fastcomp-%precompiled_tag64%",
     "bitness": 64,
-    "uses": ["fastcomp-clang-e%precompiled_tag64%-64bit", "node-8.9.1-64bit", "emscripten-%precompiled_tag64%"],
+    "uses": ["fastcomp-clang-e%precompiled_tag64%-64bit", "node-8.9.1-64bit", "python-3.7.4-64bit", "emscripten-%precompiled_tag64%"],
     "os": "osx",
     "version_filter": [
       ["%precompiled_tag64%", ">", "1.37.22"]
diff --git a/scripts/test.sh b/scripts/test.sh
index 1a4ae2fd1c..73c0d42efb 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -8,4 +8,7 @@ set -e
 ./emsdk install latest
 ./emsdk activate latest
 source ./emsdk_env.sh --build=Release
+# On mac and windows python3 should be in the path and point to the
+# bundled version.
+which python3
 emcc -v
diff --git a/scripts/update_python.py b/scripts/update_python.py
index eed07efd4e..e1f81e37a0 100755
--- a/scripts/update_python.py
+++ b/scripts/update_python.py
@@ -7,22 +7,28 @@
 """Updates the python binaries that we cache store at
 http://storage.google.com/webassembly.
 
-Currently this is windows only and we rely on the system python on other
-platforms.
+We only supply binaries for windows and macOS, but we do it very different ways for those two OSes.
 
-We currently bundle a version of python for windows use the following
-recipe:
+Windows recipe:
   1. Download the "embeddable zip file" version of python from python.org
   2. Remove .pth file to work around https://bugs.python.org/issue34841
   3. Download and install pywin32 in the `site-packages` directory
   4. Re-zip and upload to storage.google.com
+
+macOS recipe:
+  1. Clone cpython
+  2. Use homebrew to install and configure openssl (for static linking!)
+  3. Build cpython from source and use `make install` to create archive.
 """
 
-import urllib.request
-import subprocess
+import glob
+import multiprocessing
 import os
+import urllib.request
 import shutil
+import subprocess
 import sys
+from subprocess import check_call
 
 version = '3.7.4'
 base = 'https://www.python.org/ftp/python/%s/' % version
@@ -51,7 +57,7 @@ def make_python_patch(arch):
         urllib.request.urlretrieve(download_url, filename)
 
     os.mkdir('python-embed')
-    subprocess.check_call(['unzip', '-q', os.path.abspath(filename)], cwd='python-embed')
+    check_call(['unzip', '-q', os.path.abspath(filename)], cwd='python-embed')
     os.remove(os.path.join('python-embed', 'python37._pth'))
 
     os.mkdir('pywin32')
@@ -61,23 +67,56 @@ def make_python_patch(arch):
     os.mkdir(os.path.join('python-embed', 'lib'))
     shutil.move(os.path.join('pywin32', 'PLATLIB'), os.path.join('python-embed', 'lib', 'site-packages'))
 
-    subprocess.check_call(['zip', '-rq', os.path.join('..', out_filename), '.'], cwd='python-embed')
+    check_call(['zip', '-rq', os.path.join('..', out_filename), '.'], cwd='python-embed')
 
     upload_url = upload_base + out_filename
     print('Uploading: ' + upload_url)
     cmd = ['gsutil', 'cp', '-n', out_filename, upload_url]
     print(' '.join(cmd))
-    subprocess.check_call(cmd)
+    check_call(cmd)
 
     # cleanup if everything went fine
     shutil.rmtree('python-embed')
     shutil.rmtree('pywin32')
 
 
-def main():
-    for arch in ('amd64', 'win32'):
-        make_python_patch(arch)
+def build_python():
+    if sys.platform.startswith('darwin'):
+        osname = 'macos'
+        # Take some rather drastic steps to link openssl statically
+        check_call(['brew', 'install', 'openssl', 'pkg-config'])
+        os.remove('/usr/local/opt/openssl/lib/libssl.dylib')
+        os.remove('/usr/local/opt/openssl/lib/libcrypto.dylib')
+        os.environ['PKG_CONFIG_PATH'] = '/usr/local/opt/openssl/lib/pkgconfig/'
+    else:
+        osname = 'linux'
+
+    src_dir = 'cpython'
+    if not os.path.exists(src_dir):
+      check_call(['git', 'clone', 'https://github.com/python/cpython'])
+    check_call(['git', 'checkout', 'v' + version], cwd=src_dir)
+    check_call(['./configure'], cwd=src_dir)
+    check_call(['make', '-j', str(multiprocessing.cpu_count())], cwd=src_dir)
+    check_call(['make', 'install', 'DESTDIR=install'], cwd=src_dir)
+
+    install_dir = os.path.join(src_dir, 'install')
+    os.rename(os.path.join(install_dir, 'usr', 'local'), 'python-%s' % version)
+    tarball = 'python-%s-%s.tar.gz' % (version, osname)
+    shutil.rmtree(os.path.join('python-%s' % version, 'lib', 'python3.7', 'test'))
+    shutil.rmtree(os.path.join('python-%s' % version, 'include'))
+    for lib in glob.glob(os.path.join('python-%s' % version, 'lib', 'lib*.a')):
+      os.remove(lib)
+    check_call(['tar', 'zcvf', tarball, 'python-%s' % version])
+    print('Uploading: ' + upload_base + tarball)
+    check_call(['gsutil', 'cp', '-n', tarball, upload_base + tarball])
+
 
+def main():
+    if sys.platform.startswith('win'):
+        for arch in ('amd64', 'win32'):
+            make_python_patch(arch)
+    else:
+        build_python()
     return 0
 
 

From 0e5f2d8e11dbb6b88a97a9b253e38019ab1b92b6 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 21 Jul 2020 12:26:30 -0700
Subject: [PATCH 040/161] Rename osx -> macos (#563)

---
 emsdk.py            | 38 +++++++++++++++++++-------------------
 emsdk_manifest.json | 26 +++++++++++++-------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index dc6892af04..1186a96838 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -64,15 +64,15 @@
     # https://stackoverflow.com/questions/37460073/msys-vs-mingw-internal-environment-variables
     print('Warning: MSYSTEM environment variable is present, and is set to "' + os.getenv('MSYSTEM') + '". This shell has not been tested with emsdk and may not work.')
 
-OSX = False
+MACOS = False
 if platform.mac_ver()[0] != '':
-  OSX = True
+  MACOS = True
 
 LINUX = False
-if not OSX and (platform.system() == 'Linux' or os.name == 'posix'):
+if not MACOS and (platform.system() == 'Linux' or os.name == 'posix'):
   LINUX = True
 
-UNIX = (OSX or LINUX)
+UNIX = (MACOS or LINUX)
 
 
 # Pick which shell of 4 shells to use
@@ -133,8 +133,8 @@ def os_name():
     return 'win'
   elif LINUX:
     return 'linux'
-  elif OSX:
-    return 'osx'
+  elif MACOS:
+    return 'macos'
   else:
     raise Exception('unknown OS')
 
@@ -144,7 +144,7 @@ def os_name_for_emscripten_releases():
     return 'win'
   elif LINUX:
     return 'linux'
-  elif OSX:
+  elif MACOS:
     return 'mac'
   else:
     raise Exception('unknown OS')
@@ -738,7 +738,7 @@ def GIT(must_succeed=True):
   if must_succeed:
     if WINDOWS:
       msg = "ERROR: git executable was not found. Please install it by typing 'emsdk install git-1.9.4', or alternatively by installing it manually from http://git-scm.com/downloads . If you install git manually, remember to add it to PATH"
-    elif OSX:
+    elif MACOS:
       msg = "ERROR: git executable was not found. Please install git for this operation! This can be done from http://git-scm.com/ , or by installing XCode and then the XCode Command Line Tools (see http://stackoverflow.com/questions/9329243/xcode-4-4-command-line-tools )"
     elif LINUX:
       msg = "ERROR: git executable was not found. Please install git for this operation! This can be probably be done using your package manager, see http://git-scm.com/book/en/Getting-Started-Installing-Git"
@@ -879,7 +879,7 @@ def build_env(generator):
 
   # To work around a build issue with older Mac OS X builds, add -stdlib=libc++ to all builds.
   # See https://groups.google.com/forum/#!topic/emscripten-discuss/5Or6QIzkqf0
-  if OSX:
+  if MACOS:
     build_env['CXXFLAGS'] = ((build_env['CXXFLAGS'] + ' ') if hasattr(build_env, 'CXXFLAGS') else '') + '-stdlib=libc++'
   elif 'Visual Studio 15' in generator or 'Visual Studio 16' in generator:
     if 'Visual Studio 16' in generator:
@@ -1015,8 +1015,8 @@ def quote_parens(x):
         print('Installing this package requires CMake. Get it from http://www.cmake.org/', file=sys.stderr)
       elif LINUX:
         print('Installing this package requires CMake. Get it via your system package manager (e.g. sudo apt-get install cmake), or from http://www.cmake.org/', file=sys.stderr)
-      elif OSX:
-        print('Installing this package requires CMake. Get it via a OSX package manager (Homebrew: "brew install cmake", or MacPorts: "sudo port install cmake"), or from http://www.cmake.org/', file=sys.stderr)
+      elif MACOS:
+        print('Installing this package requires CMake. Get it via a macOS package manager (Homebrew: "brew install cmake", or MacPorts: "sudo port install cmake"), or from http://www.cmake.org/', file=sys.stderr)
       return False
     raise
   except Exception as e:
@@ -1110,7 +1110,7 @@ def build_fastcomp(tool):
 
   # MacOS < 10.13 workaround for LLVM build bug https://github.com/kripken/emscripten/issues/5418:
   # specify HAVE_FUTIMENS=0 in the build if building with target SDK that is older than 10.13.
-  if OSX and (not os.environ.get('LLVM_CMAKE_ARGS') or 'HAVE_FUTIMENS' not in os.environ.get('LLVM_CMAKE_ARGS')) and xcode_sdk_version() < ['10', '13']:
+  if MACOS and (not os.environ.get('LLVM_CMAKE_ARGS') or 'HAVE_FUTIMENS' not in os.environ.get('LLVM_CMAKE_ARGS')) and xcode_sdk_version() < ['10', '13']:
     print('Passing -DHAVE_FUTIMENS=0 to LLVM CMake configure to workaround https://github.com/kripken/emscripten/issues/5418. Please update to macOS 10.13 or newer')
     args += ['-DHAVE_FUTIMENS=0']
 
@@ -1617,15 +1617,15 @@ def compatible_with_this_os(self):
     if hasattr(self, 'os'):
       if self.os == 'all':
         return True
-      if self.compatible_with_this_arch() and ((WINDOWS and 'win' in self.os) or (LINUX and ('linux' in self.os or 'unix' in self.os)) or (OSX and ('osx' in self.os or 'unix' in self.os))):
+      if self.compatible_with_this_arch() and ((WINDOWS and 'win' in self.os) or (LINUX and ('linux' in self.os or 'unix' in self.os)) or (MACOS and ('macos' in self.os or 'unix' in self.os))):
         return True
       else:
         return False
     else:
-      if not hasattr(self, 'osx_url') and not hasattr(self, 'windows_url') and not hasattr(self, 'unix_url') and not hasattr(self, 'linux_url'):
+      if not hasattr(self, 'macos_url') and not hasattr(self, 'windows_url') and not hasattr(self, 'unix_url') and not hasattr(self, 'linux_url'):
         return True
 
-    if OSX and hasattr(self, 'osx_url') and self.compatible_with_this_arch():
+    if MACOS and hasattr(self, 'macos_url') and self.compatible_with_this_arch():
       return True
 
     if LINUX and hasattr(self, 'linux_url') and self.compatible_with_this_arch():
@@ -1792,8 +1792,8 @@ def can_be_installed(self):
   def download_url(self):
     if WINDOWS and hasattr(self, 'windows_url'):
       return self.windows_url
-    elif OSX and hasattr(self, 'osx_url'):
-      return self.osx_url
+    elif MACOS and hasattr(self, 'macos_url'):
+      return self.macos_url
     elif LINUX and hasattr(self, 'linux_url'):
       return self.linux_url
     elif UNIX and hasattr(self, 'unix_url'):
@@ -2102,7 +2102,7 @@ def fetch_emscripten_tags():
     print('Update complete, however skipped fetching the Emscripten tags, since git was not found, which is necessary for update-tags.')
     if WINDOWS:
       print("Please install git by typing 'emsdk install git-1.9.4', or alternatively by installing it manually from http://git-scm.com/downloads . If you install git manually, remember to add it to PATH.")
-    elif OSX:
+    elif MACOS:
       print("Please install git from http://git-scm.com/ , or by installing XCode and then the XCode Command Line Tools (see http://stackoverflow.com/questions/9329243/xcode-4-4-command-line-tools ).")
     elif LINUX:
       print("Pease install git using your package manager, see http://git-scm.com/book/en/Getting-Started-Installing-Git .")
@@ -2867,7 +2867,7 @@ def installed_sdk_text(name):
       sdk = find_sdk(name)
       return 'INSTALLED' if sdk and sdk.is_installed() else ''
 
-    if (LINUX or OSX or WINDOWS) and (ARCH == 'x86' or ARCH == 'x86_64'):
+    if (LINUX or MACOS or WINDOWS) and (ARCH == 'x86' or ARCH == 'x86_64'):
       print('The *recommended* precompiled SDK download is %s (%s).' % (find_latest_releases_version(), find_latest_releases_hash()))
       print()
       print('To install/activate it, use one of:')
diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 50e524eff7..2861604a1b 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -94,7 +94,7 @@
     "bitness": 64,
     "arch": "x86_64",
     "linux_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/%releases-tag%/wasm-binaries.tbz2",
-    "osx_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/%releases-tag%/wasm-binaries.tbz2",
+    "macos_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/%releases-tag%/wasm-binaries.tbz2",
     "windows_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/win/%releases-tag%/wasm-binaries.zip",
     "zipfile_prefix": "%releases-tag%-",
     "install_path": "upstream",
@@ -109,7 +109,7 @@
     "bitness": 64,
     "arch": "x86_64",
     "linux_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/%releases-tag%/wasm-binaries.tbz2",
-    "osx_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/%releases-tag%/wasm-binaries.tbz2",
+    "macos_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/%releases-tag%/wasm-binaries.tbz2",
     "windows_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/win/%releases-tag%/wasm-binaries.zip",
     "zipfile_prefix": "%releases-tag%-",
     "install_path": "fastcomp",
@@ -125,7 +125,7 @@
     "bitness": 32,
     "arch": "x86",
     "windows_url": "llvm/tag/win_64bit/emscripten-llvm-e%precompiled_tag32%.zip",
-    "osx_url": "llvm/tag/osx_64bit/emscripten-llvm-e%precompiled_tag32%.tar.gz",
+    "macos_url": "llvm/tag/osx_64bit/emscripten-llvm-e%precompiled_tag32%.tar.gz",
     "linux_url": "llvm/tag/linux_64bit/emscripten-llvm-e%precompiled_tag32%.tar.gz",
     "activated_path": "%installation_dir%",
     "activated_cfg": "LLVM_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%/optimizer%.exe%';BINARYEN_ROOT='%installation_dir%/binaryen'",
@@ -137,7 +137,7 @@
     "bitness": 64,
     "arch": "x86_64",
     "windows_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/old/win/emscripten-llvm-e%precompiled_tag64%.zip",
-    "osx_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/old/mac/emscripten-llvm-e%precompiled_tag64%.tar.gz",
+    "macos_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/old/mac/emscripten-llvm-e%precompiled_tag64%.tar.gz",
     "linux_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/old/linux/emscripten-llvm-e%precompiled_tag64%.tar.gz",
     "activated_path": "%installation_dir%",
     "activated_cfg": "LLVM_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%/optimizer%.exe%';BINARYEN_ROOT='%installation_dir%/binaryen'",
@@ -169,7 +169,7 @@
     "version": "8.9.1",
     "bitness": 64,
     "arch": "x86_64",
-    "osx_url": "node-v8.9.1-darwin-x64.tar.gz",
+    "macos_url": "node-v8.9.1-darwin-x64.tar.gz",
     "windows_url": "node-v8.9.1-win-x64.zip",
     "linux_url": "node-v8.9.1-linux-x64.tar.xz",
     "activated_path": "%installation_dir%/bin",
@@ -211,7 +211,7 @@
     "version": "12.18.1",
     "bitness": 64,
     "arch": "x86_64",
-    "osx_url": "node-v12.18.1-darwin-x64.tar.gz",
+    "macos_url": "node-v12.18.1-darwin-x64.tar.gz",
     "windows_url": "node-v12.18.1-win-x64.zip",
     "linux_url": "node-v12.18.1-linux-x64.tar.xz",
     "activated_path": "%installation_dir%/bin",
@@ -293,7 +293,7 @@
     "version": "3.7.4",
     "bitness": 64,
     "arch": "x86_64",
-    "osx_url": "python-3.7.4-macos.tar.gz",
+    "macos_url": "python-3.7.4-macos.tar.gz",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
     "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3"
@@ -486,7 +486,7 @@
     "version": "upstream-master",
     "bitness": 64,
     "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
-    "os": "osx"
+    "os": "macos"
   },
   {
     "version": "upstream-master",
@@ -516,7 +516,7 @@
     "version": "fastcomp-master",
     "bitness": 64,
     "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
-    "os": "osx"
+    "os": "macos"
   },
   {
     "version": "fastcomp-master",
@@ -577,7 +577,7 @@
     "version": "releases-upstream-%releases-tag%",
     "bitness": 64,
     "uses": ["node-12.18.1-64bit", "python-3.7.4-64bit", "releases-upstream-%releases-tag%-64bit"],
-    "os": "osx",
+    "os": "macos",
     "custom_install_script": "emscripten_npm_install"
   },
   {
@@ -598,7 +598,7 @@
     "version": "releases-fastcomp-%releases-tag%",
     "bitness": 64,
     "uses": ["node-12.18.1-64bit", "python-3.7.4-64bit", "releases-fastcomp-%releases-tag%-64bit"],
-    "os": "osx",
+    "os": "macos",
     "custom_install_script": "emscripten_npm_install"
   },
   {
@@ -648,7 +648,7 @@
     "version": "fastcomp-%precompiled_tag32%",
     "bitness": 32,
     "uses": ["fastcomp-clang-e%precompiled_tag32%-32bit", "node-8.9.1-32bit", "python-3.7.4-64bit", "emscripten-%precompiled_tag32%"],
-    "os": "osx",
+    "os": "macos",
     "version_filter": [
       ["%precompiled_tag32%", ">", "1.37.22"]
     ]
@@ -657,7 +657,7 @@
     "version": "fastcomp-%precompiled_tag64%",
     "bitness": 64,
     "uses": ["fastcomp-clang-e%precompiled_tag64%-64bit", "node-8.9.1-64bit", "python-3.7.4-64bit", "emscripten-%precompiled_tag64%"],
-    "os": "osx",
+    "os": "macos",
     "version_filter": [
       ["%precompiled_tag64%", ">", "1.37.22"]
     ]

From 4d4ae343650539c973772d0874d33a65903ac6f0 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 21 Jul 2020 18:04:31 -0700
Subject: [PATCH 041/161] Improve activation message (#562)

* Improve activation message

The activation message is now IMHO more informative and
actionable:

```
$ emsdk activate latest
Setting the following tools as active:
   node-12.18.1-64bit
   releases-upstream-e7e39da9c81faecd9ecf44065cee864d76e4e34d-64bit

Next steps:
- To conveniently access emsdk tools from the command line,
  consider adding the following directories to your PATH:
    $HOME/wasm/emsdk
    $HOME/wasm/emsdk/node/12.18.1_64bit/bin
    $HOME/wasm/emsdk/upstream/emscripten
- This can be done for the current shell by running:
    source "$HOME/wasm/emsdk/emsdk_env.sh"
- Configure emsdk in your bash profile by running:
    echo 'source "$HOME/wasm/emsdk/emsdk_env.sh"' >> $HOME/.bash_profile
```

* .
---
 emsdk.py | 43 +++++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 1186a96838..f3ab07dc28 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -1460,10 +1460,8 @@ def generate_dot_emscripten(active_tools):
 
   cfg = cfg.replace("'" + emsdk_path(), "emsdk_path + '")
 
-  print('Writing configuration file: ' + dot_emscripten_path())
   if os.path.exists(dot_emscripten_path()):
     backup_path = dot_emscripten_path() + ".old"
-    print("Backing up old Emscripten configuration file in " + os.path.normpath(backup_path))
     move_with_overwrite(dot_emscripten_path(), backup_path)
 
   with open(dot_emscripten_path(), "w") as text_file:
@@ -1472,20 +1470,18 @@ def generate_dot_emscripten(active_tools):
   # Clear old emscripten content.
   rmfile(os.path.join(emsdk_path(), ".emscripten_sanity"))
 
-  print("Configuration file contents:")
-  print('')
-  print(cfg.strip())
-  print('')
-
   path_add = get_required_path(active_tools)
   if not WINDOWS:
-    emsdk_env = os.path.relpath(sdk_path('emsdk_env.sh'))
-    if '/' not in emsdk_env:
-      emsdk_env = './emsdk_env.sh'
-    print("To conveniently access the selected set of tools from the command line, consider adding the following directories to PATH.")
-    print("Or call 'source " + emsdk_env + "' to do this for you. (Add these in your bashrc or other startup scripts to have these permanently available)")
-    print('')
-    print('   ' + ENVPATH_SEPARATOR.join(path_add))
+    emsdk_env = sdk_path('emsdk_env.sh')
+    print('Next steps:')
+    print('- To conveniently access emsdk tools from the command line,')
+    print('  consider adding the following directories to your PATH:')
+    for p in path_add:
+      print('    ' + p)
+    print('- This can be done for the current shell by running:')
+    print('    source "%s"' % emsdk_env)
+    print('- Configure emsdk in your bash profile by running:')
+    print('    echo \'source "%s"\' >> $HOME/.bash_profile' % emsdk_env)
 
 
 def find_msbuild_dir():
@@ -2461,6 +2457,11 @@ def write_set_env_script(env_string):
 def set_active_tools(tools_to_activate, permanently_activate):
   tools_to_activate = process_tool_list(tools_to_activate, log_errors=True)
 
+  if tools_to_activate:
+    tools = [x for x in tools_to_activate if not x.is_sdk]
+    print('Setting the following tools as active:\n   ' + '\n   '.join(map(lambda x: str(x), tools)))
+    print('')
+
   generate_dot_emscripten(tools_to_activate)
 
   copy_pregenerated_cache(tools_to_activate)
@@ -2485,10 +2486,6 @@ def set_active_tools(tools_to_activate, permanently_activate):
     if newpath != os.environ['PATH']:
       win_set_environment_variable('PATH', newpath, system=True)
 
-  if tools_to_activate:
-    tools = [x for x in tools_to_activate if not x.is_sdk]
-    print('\nSet the following tools as active:\n   ' + '\n   '.join(map(lambda x: str(x), tools)))
-    print('')
   return tools_to_activate
 
 
@@ -2614,15 +2611,9 @@ def construct_env(tools_to_activate):
       value = to_native_path(tool.expand_vars(value))
       env_vars += [(key, value)]
 
-  # Don't set env vars which are already set to the correct value.
-  env_vars_to_add = []
-  for key, value in env_vars:
-    if key not in os.environ or to_unix_path(os.environ[key]) != to_unix_path(value):
-      env_vars_to_add.append((key, value))
-
-  if env_vars_to_add:
+  if env_vars:
     log_stderr('Setting environment variables:')
-    for key, value in env_vars_to_add:
+    for key, value in env_vars:
       if POWERSHELL:
         env_string += '$env:' + key + '="' + value + '"\n'
       elif CMD:

From 9b405d313a22784bae731e7bd33af867d331532a Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 21 Jul 2020 21:29:12 -0700
Subject: [PATCH 042/161] Add new python version of known versions in emsdk.bat
 (#565)

---
 emsdk.bat | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/emsdk.bat b/emsdk.bat
index 0decd1dc94..5daffe51fa 100644
--- a/emsdk.bat
+++ b/emsdk.bat
@@ -1,4 +1,9 @@
 :: Find python from an explicit location relative to the Emscripten SDK.
+@IF EXIST "%~dp0python\3.7.4-pywin32_64bit\python.exe" (
+  @SET EMSDK_PY="%~dp0python\3.7.4-pywin32_64bit\python.exe"
+  @GOTO end
+)
+
 @IF EXIST "%~dp0python\3.7.4_64bit\python.exe" (
   @SET EMSDK_PY="%~dp0python\3.7.4_64bit\python.exe"
   @GOTO end

From 56f5a2bcc55576a29f17e9d14ed25ce82a341b6c Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Wed, 22 Jul 2020 14:06:08 -0700
Subject: [PATCH 043/161] Cleanup emsdk.bat launcher (#566)

TIL a couple of things about bat files. God help me.

- Use a single @echo off at the top rather than @ on every line
- Use lowercase names for builtin operation
- Use setlocal/endlocal rather than reseting EM_PYTHON at the end
---
 emsdk.bat | 65 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/emsdk.bat b/emsdk.bat
index 5daffe51fa..c65f23e644 100644
--- a/emsdk.bat
+++ b/emsdk.bat
@@ -1,56 +1,61 @@
+@echo off
+
 :: Find python from an explicit location relative to the Emscripten SDK.
-@IF EXIST "%~dp0python\3.7.4-pywin32_64bit\python.exe" (
-  @SET EMSDK_PY="%~dp0python\3.7.4-pywin32_64bit\python.exe"
-  @GOTO end
+
+setlocal
+
+if exist "%~dp0python\3.7.4-pywin32_64bit\python.exe" (
+  set EMSDK_PY="%~dp0python\3.7.4-pywin32_64bit\python.exe"
+  goto end
 )
 
-@IF EXIST "%~dp0python\3.7.4_64bit\python.exe" (
-  @SET EMSDK_PY="%~dp0python\3.7.4_64bit\python.exe"
-  @GOTO end
+if exist "%~dp0python\3.7.4_64bit\python.exe" (
+  set EMSDK_PY="%~dp0python\3.7.4_64bit\python.exe"
+  goto end
 )
 
-@IF EXIST "%~dp0python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe" (
-  @SET EMSDK_PY="%~dp0python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe"
-  @GOTO end
+if exist "%~dp0python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe" (
+  set EMSDK_PY="%~dp0python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe"
+  goto end
 )
 
-@IF EXIST "%~dp0python\2.7.13.1_32bit\python-2.7.13\python.exe" (
-  @SET EMSDK_PY="%~dp0python\2.7.13.1_32bit\python-2.7.13\python.exe"
-  @GOTO end
+if exist "%~dp0python\2.7.13.1_32bit\python-2.7.13\python.exe" (
+  set EMSDK_PY="%~dp0python\2.7.13.1_32bit\python-2.7.13\python.exe"
+  goto end
 )
 
-@IF EXIST "%~dp0python\2.7.5.3_64bit\python.exe" (
-  @SET EMSDK_PY="%~dp0python\2.7.5.3_64bit\python.exe"
-  @GOTO end
+if exist "%~dp0python\2.7.5.3_64bit\python.exe" (
+  set EMSDK_PY="%~dp0python\2.7.5.3_64bit\python.exe"
+  goto end
 )
 
-@IF EXIST "%~dp0python\2.7.5.3_32bit\python.exe" (
-  @SET EMSDK_PY="%~dp0python\2.7.5.3_32bit\python.exe"
-  @GOTO end
+if exist "%~dp0python\2.7.5.3_32bit\python.exe" (
+  set EMSDK_PY="%~dp0python\2.7.5.3_32bit\python.exe"
+  goto end
 )
 
-@IF EXIST "%~dp0python\2.7.5_64bit\python.exe" (
-  @SET EMSDK_PY="%~dp0python\2.7.5_64bit\python.exe"
-  @GOTO end
+if exist "%~dp0python\2.7.5_64bit\python.exe" (
+  set EMSDK_PY="%~dp0python\2.7.5_64bit\python.exe"
+  goto end
 )
 
-@IF EXIST "%~dp0python\2.7.5.1_32bit\python.exe" (
-  @SET EMSDK_PY="%~dp0python\2.7.5.1_32bit\python.exe"
-  @GOTO end
+if exist "%~dp0python\2.7.5.1_32bit\python.exe" (
+  set EMSDK_PY="%~dp0python\2.7.5.1_32bit\python.exe"
+  goto end
 )
 
 :: As a last resort, access from PATH.
-@SET EMSDK_PY=python
+set EMSDK_PY=python
 
 :end
-@call %EMSDK_PY% "%~dp0\emsdk.py" %*
+call %EMSDK_PY% "%~dp0\emsdk.py" %*
 
-@set EMSDK_PY=
+endlocal
 
 :: python is not able to set environment variables to the parent calling
 :: process, so therefore have it craft a .bat file, which we invoke after
 :: finishing python execution, to set up the environment variables
-@IF EXIST "%~dp0\emsdk_set_env.bat" (
-  @CALL "%~dp0\emsdk_set_env.bat" > NUL
-  @DEL /F /Q "%~dp0\emsdk_set_env.bat"
+if exist "%~dp0\emsdk_set_env.bat" (
+  call "%~dp0\emsdk_set_env.bat" > nul
+  del /F /Q "%~dp0\emsdk_set_env.bat"
 )

From b5077e4642dece76c4abfd781bd1e6790ae889df Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Thu, 23 Jul 2020 21:49:48 +0200
Subject: [PATCH 044/161] Fix sanity file location within Dockerfile (#568)

Starting from 1.39.20 the .emscripten_sanity file has
been moved to upstream/emscripten/cache/sanity.txt.
---
 docker/Dockerfile | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a01ddbceaf..5421c7f3e1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster AS stage_build
 
-ARG EMSCRIPTEN_VERSION=1.39.18
+ARG EMSCRIPTEN_VERSION=1.39.20
 ENV EMSDK /emsdk
 
 # ------------------------------------------------------------------------------
@@ -33,6 +33,7 @@ RUN cd ${EMSDK} \
     &&  echo "## Generate standard configuration" \
     &&  ./emsdk activate ${EMSCRIPTEN_VERSION} \
     &&  chmod -R 777 ${EMSDK}/upstream/emscripten/cache \
+    &&  cat ${EMSDK}/upstream/emscripten/cache/sanity.txt \
 &&  echo "## Done"
 
 # Clean up emscripten installation and strip some symbols
@@ -50,16 +51,6 @@ RUN echo "## Aggresive optimization: Remove debug symbols" \
     && find ${EMSDK}/upstream/bin -type f -exec strip -s {} + || true \
 &&  echo "## Done"
 
-# Generate sanity
-# TODO(sbc): We should be able to use just emcc -v here but it doesn't
-# currently create the sanity file.
-RUN echo "## Generate sanity" \
-   &&  cd ${EMSDK} && . ./emsdk_env.sh \
-   &&  echo "int main() { return 0; }" > hello.c \
-   &&  emcc -c hello.c \
-   &&  cat ${EMSDK}/.emscripten_sanity \
-&&  echo "## Done"
-
 # ------------------------------------------------------------------------------
 # -------------------------------- STAGE DEPLOY --------------------------------
 # ------------------------------------------------------------------------------

From de08462b17adaf3e22656761abaf28d545d64bab Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Sat, 25 Jul 2020 20:04:20 +0200
Subject: [PATCH 045/161] Cleanup Dockerfile. NFC. (#569)

- Remove unnecessary dependencies from build stage.
- Move binutils installation to first layer.
- Adjust indents and spacing.
- Merge ENV declarations into a single line.
- Split apt-get commands over multiple lines
---
 docker/Dockerfile | 110 ++++++++++++++++++++++------------------------
 1 file changed, 53 insertions(+), 57 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5421c7f3e1..fb782742db 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,40 +6,37 @@ ENV EMSDK /emsdk
 # ------------------------------------------------------------------------------
 
 RUN echo "## Start building" \
-    \
-&&	echo "## Update and install packages" \
-    &&	apt-get -qq -y update \
-    &&  apt-get -qq install -y --no-install-recommends \
-            libxml2 \
-            wget \
-            git-core \
-            ca-certificates \
-            build-essential \
-            file \
-            python3 python3-pip \
-&&  echo "## Done"
-
-RUN  echo "## Get EMSDK" \
-    &&  git clone https://github.com/emscripten-core/emsdk.git ${EMSDK} \
-&&  echo "## Done"
-
-RUN  echo "## Install Emscripten" \
-    &&  cd ${EMSDK} \
-    &&  ./emsdk install ${EMSCRIPTEN_VERSION} \
-&&  echo "## Done"
+    && echo "## Update and install packages" \
+    && apt-get -qq -y update \
+    && apt-get -qq install -y --no-install-recommends \
+        binutils \
+        build-essential \
+        ca-certificates \
+        file \
+        git \
+        python3 \
+        python3-pip \
+    && echo "## Done"
+
+RUN echo "## Get EMSDK" \
+    && git clone https://github.com/emscripten-core/emsdk.git ${EMSDK} \
+    && echo "## Done"
+
+RUN echo "## Install Emscripten" \
+    && cd ${EMSDK} \
+    && ./emsdk install ${EMSCRIPTEN_VERSION} \
+    && echo "## Done"
 
 # This generates configuration that contains all valid paths according to installed SDK
 RUN cd ${EMSDK} \
-    &&  echo "## Generate standard configuration" \
-    &&  ./emsdk activate ${EMSCRIPTEN_VERSION} \
-    &&  chmod -R 777 ${EMSDK}/upstream/emscripten/cache \
-    &&  cat ${EMSDK}/upstream/emscripten/cache/sanity.txt \
-&&  echo "## Done"
-
-# Clean up emscripten installation and strip some symbols
-RUN echo "## Aggresive optimization: Remove debug symbols" \
-&&  apt-get -qq -y update && apt-get -qq install -y --no-install-recommends \
-        binutils \
+    && echo "## Generate standard configuration" \
+    && ./emsdk activate ${EMSCRIPTEN_VERSION} \
+    && chmod -R 777 ${EMSDK}/upstream/emscripten/cache \
+    && cat ${EMSDK}/upstream/emscripten/cache/sanity.txt \
+    && echo "## Done"
+
+# Cleanup Emscripten installation and strip some symbols
+RUN echo "## Aggressive optimization: Remove debug symbols" \
     && cd ${EMSDK} && . ./emsdk_env.sh \
     # Remove debugging symbols from embedded node (extra 7MB)
     && strip -s `which node` \
@@ -49,7 +46,7 @@ RUN echo "## Aggresive optimization: Remove debug symbols" \
     && rm -fr ${EMSDK}/upstream/fastcomp \
     # strip out symbols from clang (~extra 50MB disc space)
     && find ${EMSDK}/upstream/bin -type f -exec strip -s {} + || true \
-&&  echo "## Done"
+    && echo "## Done"
 
 # ------------------------------------------------------------------------------
 # -------------------------------- STAGE DEPLOY --------------------------------
@@ -62,10 +59,10 @@ COPY --from=stage_build /emsdk /emsdk
 # Fallback in case Emscripten isn't activated.
 # This will let use tools offered by this image inside other Docker images
 # (sub-stages) or with custom / no entrypoint
-ENV EMSDK_NODE=/emsdk/node/12.18.1_64bit/bin/node
-ENV EMSDK=/emsdk
-ENV EM_CONFIG=/emsdk/.emscripten
-ENV PATH="${EMSDK}:${EMSDK}/upstream/emscripten:${EMSDK}/upstream/bin:emsdk/node/12.18.1_64bit/bin:${PATH}"
+ENV EMSDK=/emsdk \
+    EM_CONFIG=/emsdk/.emscripten \
+    EMSDK_NODE=/emsdk/node/12.18.1_64bit/bin/node \
+    PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/upstream/bin:/emsdk/node/12.18.1_64bit/bin:${PATH}"
 
 # ------------------------------------------------------------------------------
 # Create a 'standard` 1000:1000 user
@@ -76,19 +73,19 @@ ENV PATH="${EMSDK}:${EMSDK}/upstream/emscripten:${EMSDK}/upstream/bin:emsdk/node
 # docker image will cause other random problems (mostly due `$HOME` pointing to
 # `/`)
 RUN echo "## Create emscripten user (1000:1000)" \
-    &&  groupadd --gid 1000 emscripten \
-    &&  useradd --uid 1000 --gid emscripten --shell /bin/bash --create-home emscripten \
-    &&  echo "umask 0000" >> /etc/bash.bashrc \
-    &&  echo ". /emsdk/emsdk_env.sh" >> /etc/bash.bashrc \
-&&  echo "## Done"
+    && groupadd --gid 1000 emscripten \
+    && useradd --uid 1000 --gid emscripten --shell /bin/bash --create-home emscripten \
+    && echo "umask 0000" >> /etc/bash.bashrc \
+    && echo ". /emsdk/emsdk_env.sh" >> /etc/bash.bashrc \
+    && echo "## Done"
 
 # ------------------------------------------------------------------------------
 
 RUN echo "## Update and install packages" \
-# mitigate problem with create symlink to man for base debian image
-    &&  mkdir -p /usr/share/man/man1/ \
-    \
-    &&  apt-get -qq -y update && apt-get -qq install -y --no-install-recommends \
+    # mitigate problem with create symlink to man for base debian image
+    && mkdir -p /usr/share/man/man1/ \
+    && apt-get -qq -y update \
+    && apt-get -qq install -y --no-install-recommends \
         libxml2 \
         ca-certificates \
         python3 \
@@ -105,25 +102,24 @@ RUN echo "## Update and install packages" \
         libidn11 \
         cmake \
         openjdk-11-jre-headless \
-    \
     # Standard Cleanup on Debian images
-    &&  apt-get -y clean \
-    &&  apt-get -y autoclean \
-    &&  apt-get -y autoremove \
-    &&  rm -rf /var/lib/apt/lists/* \
-    &&  rm -rf /var/cache/debconf/*-old \
-    &&  rm -rf /usr/share/doc/* \
-    &&  rm -rf /usr/share/man/?? \
-    &&  rm -rf /usr/share/man/??_* \
-&&  echo "## Done"
+    && apt-get -y clean \
+    && apt-get -y autoclean \
+    && apt-get -y autoremove \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /var/cache/debconf/*-old \
+    && rm -rf /usr/share/doc/* \
+    && rm -rf /usr/share/man/?? \
+    && rm -rf /usr/share/man/??_* \
+    && echo "## Done"
 
 # ------------------------------------------------------------------------------
 # Internal test suite of tools that this image provides
 COPY test_dockerimage.sh /emsdk/
 
 RUN echo "## Internal Testing of image" \
-    &&  /emsdk/test_dockerimage.sh  \
-&&  echo "## Done"
+    && /emsdk/test_dockerimage.sh \
+    && echo "## Done"
 
 # ------------------------------------------------------------------------------
 # Copy this Dockerimage into image, so that it will be possible to recreate it later

From 6dac5ae712c922492ac84d91bb22e59b05c22f9c Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 27 Jul 2020 15:32:06 -0700
Subject: [PATCH 046/161] Fail `update-tags` if not tot revision is found
 (#574)

---
 emsdk.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index f3ab07dc28..2f4393d24c 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2051,7 +2051,7 @@ def get_emscripten_releases_tot():
     except:
       continue
     return release
-  return ''
+  exit_with_error('failed to find build of any recent emsdk revision')
 
 
 def get_release_hash(arg, releases_info):
@@ -2092,8 +2092,7 @@ def fetch_emscripten_tags():
   if git:
     print('Fetching emscripten-releases repository...')
     emscripten_releases_tot = get_emscripten_releases_tot()
-    if emscripten_releases_tot:
-      open(tot_path(), 'w').write(emscripten_releases_tot)
+    open(tot_path(), 'w').write(emscripten_releases_tot)
   else:
     print('Update complete, however skipped fetching the Emscripten tags, since git was not found, which is necessary for update-tags.')
     if WINDOWS:

From e3b08413c9ee172db3c9c40565705494de4688dc Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <aardappel@gmail.com>
Date: Wed, 29 Jul 2020 13:18:23 -0700
Subject: [PATCH 047/161] [powershell] fix emsdk.ps1 assuming emsdk_set_env.ps1
 lives in the current dir (#576)

This makes it fail when run from a project directory.
Thansks @sbc100 for finding the problem :)
---
 emsdk.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/emsdk.ps1 b/emsdk.ps1
index ebd6f80247..183a145eff 100644
--- a/emsdk.ps1
+++ b/emsdk.ps1
@@ -31,9 +31,9 @@ $env:EMSDK_POWERSHELL = 1
 # python is not able to set environment variables to the parent calling process, so
 # therefore have it craft a .ps1 file, which we invoke after finishing python execution,
 # to set up the environment variables
-if (Test-Path ./emsdk_set_env.ps1) {
-    & ./emsdk_set_env.ps1
-    Remove-Item ./emsdk_set_env.ps1
+if (Test-Path $ScriptDirectory/emsdk_set_env.ps1) {
+    & $ScriptDirectory/emsdk_set_env.ps1
+    Remove-Item $ScriptDirectory/emsdk_set_env.ps1
 }
 
 Remove-Item Env:\EMSDK_POWERSHELL

From 1dc9fde17566327aabf722872a0711c5bb45e0a9 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Thu, 30 Jul 2020 09:34:46 -0700
Subject: [PATCH 048/161] 1.40.0 (#577)

---
 emscripten-releases-tags.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index bba8c717ee..d5049606fa 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "1.39.20",
+  "latest": "1.40.0",
   "releases": {
+    "1.40.0":  "edf24e7233e0def312a08cc8dcec63a461155da1",
     "1.39.20": "e7e39da9c81faecd9ecf44065cee864d76e4e34d",
     "1.39.19": "665121d026cafc46c29b30d6d4c45ed73eedbb7e",
     "1.39.18": "1914a1543f08cd8e41f44c2bb05f7a90d1920275",

From 147abfe46c7828cb413e27cea082bfe47335c2f2 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 31 Jul 2020 13:41:13 -0700
Subject: [PATCH 049/161] Make emscripten directory world writable (#578)

Without this emscripten will default to using $HOME for the
emscripten cache rather than the embedded one.
---
 docker/Dockerfile          | 2 ++
 docker/test_dockerimage.sh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index fb782742db..8f3f159d40 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -31,6 +31,7 @@ RUN echo "## Install Emscripten" \
 RUN cd ${EMSDK} \
     && echo "## Generate standard configuration" \
     && ./emsdk activate ${EMSCRIPTEN_VERSION} \
+    && chmod 777 ${EMSDK}/upstream/emscripten \
     && chmod -R 777 ${EMSDK}/upstream/emscripten/cache \
     && cat ${EMSDK}/upstream/emscripten/cache/sanity.txt \
     && echo "## Done"
@@ -86,6 +87,7 @@ RUN echo "## Update and install packages" \
     && mkdir -p /usr/share/man/man1/ \
     && apt-get -qq -y update \
     && apt-get -qq install -y --no-install-recommends \
+        sudo \
         libxml2 \
         ca-certificates \
         python3 \
diff --git a/docker/test_dockerimage.sh b/docker/test_dockerimage.sh
index 901ee9287b..9c8b92bf1e 100755
--- a/docker/test_dockerimage.sh
+++ b/docker/test_dockerimage.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -ex
 
+sudo -u nobody `which emcc` --version
+
 which asm2wasm
 which llvm-ar
 which emsdk

From e88a3c5bbfef172a5b947768204ef734e2fb6e04 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Sat, 1 Aug 2020 07:45:21 -0700
Subject: [PATCH 050/161] 1.40.1 (#579)

---
 emscripten-releases-tags.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index d5049606fa..e2d8c9dee0 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "1.40.0",
+  "latest": "1.40.1",
   "releases": {
+    "1.40.1":  "536568644fd67d53778f6111fdd5f64ad3f4c539",
     "1.40.0":  "edf24e7233e0def312a08cc8dcec63a461155da1",
     "1.39.20": "e7e39da9c81faecd9ecf44065cee864d76e4e34d",
     "1.39.19": "665121d026cafc46c29b30d6d4c45ed73eedbb7e",

From 60e3a51c7ba8bb96a47d06280b0b1f8ef711608b Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Wed, 5 Aug 2020 10:03:41 -0700
Subject: [PATCH 051/161] Split out `expand_sdk_name` function. NFC. (#580)

---
 emsdk.py | 81 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 2f4393d24c..1f57332f1b 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2635,6 +2635,47 @@ def error_on_missing_tool(name):
   return 1
 
 
+def expand_sdk_name(name):
+  if name in ('latest', 'sdk-latest', 'latest-64bit', 'sdk-latest-64bit'):
+    # This is effectly the default SDK
+    return str(find_latest_releases_sdk('upstream'))
+  elif name in ('latest-fastcomp', 'latest-releases-fastcomp'):
+    return str(find_latest_releases_sdk('fastcomp'))
+  elif name in ('latest-upstream', 'latest-clang-upstream', 'latest-releases-upstream'):
+    return str(find_latest_releases_sdk('upstream'))
+  elif name in ('tot', 'sdk-tot'):
+    return str(find_tot_sdk('upstream'))
+  elif name == 'tot-upstream':
+    return str(find_tot_sdk('upstream'))
+  elif name in ('tot-fastcomp', 'sdk-nightly-latest'):
+    return str(find_tot_sdk('fastcomp'))
+  else:
+    # check if it's a release handled by an emscripten-releases version,
+    # and if so use that by using the right hash. we support a few notations,
+    #   x.y.z[-(upstream|fastcomp_])
+    #   sdk-x.y.z[-(upstream|fastcomp_])-64bit
+    # TODO: support short notation for old builds too?
+    backend = None
+    fullname = name
+    if '-upstream' in fullname:
+      fullname = name.replace('-upstream', '')
+      backend = 'upstream'
+    elif '-fastcomp' in fullname:
+      fullname = fullname.replace('-fastcomp', '')
+      backend = 'fastcomp'
+    fullname = fullname.replace('sdk-', '').replace('-64bit', '').replace('tag-', '')
+    releases_info = load_releases_info()['releases']
+    release_hash = get_release_hash(fullname, releases_info)
+    if release_hash:
+      if backend is None:
+        if version_key(fullname) >= (1, 39, 0):
+          backend = 'upstream'
+        else:
+          backend = 'fastcomp'
+      return 'sdk-releases-%s-%s-64bit' % (backend, release_hash)
+  return name
+
+
 def main():
   global BUILD_FOR_TESTING, ENABLE_LLVM_ASSERTIONS, TTY_OUTPUT
 
@@ -2808,47 +2849,10 @@ def extract_bool_arg(name):
         return 1
   sys.argv = [x for x in sys.argv if not len(x) == 0]
 
-  releases_info = load_releases_info()['releases']
-
   # Replace meta-packages with the real package names.
   if cmd in ('update', 'install', 'activate'):
     for i in range(2, len(sys.argv)):
-      arg = sys.argv[i]
-      if arg in ('latest', 'sdk-latest', 'latest-64bit', 'sdk-latest-64bit'):
-        # This is effectly the default SDK
-        sys.argv[i] = str(find_latest_releases_sdk('upstream'))
-      elif arg in ('latest-fastcomp', 'latest-releases-fastcomp'):
-        sys.argv[i] = str(find_latest_releases_sdk('fastcomp'))
-      elif arg in ('latest-upstream', 'latest-clang-upstream', 'latest-releases-upstream'):
-        sys.argv[i] = str(find_latest_releases_sdk('upstream'))
-      elif arg in ('tot', 'sdk-tot'):
-        sys.argv[i] = str(find_tot_sdk('upstream'))
-      elif arg == 'tot-upstream':
-        sys.argv[i] = str(find_tot_sdk('upstream'))
-      elif arg in ('tot-fastcomp', 'sdk-nightly-latest'):
-        sys.argv[i] = str(find_tot_sdk('fastcomp'))
-      else:
-        # check if it's a release handled by an emscripten-releases version,
-        # and if so use that by using the right hash. we support a few notations,
-        #   x.y.z[-(upstream|fastcomp_])
-        #   sdk-x.y.z[-(upstream|fastcomp_])-64bit
-        # TODO: support short notation for old builds too?
-        backend = None
-        if '-upstream' in arg:
-          arg = arg.replace('-upstream', '')
-          backend = 'upstream'
-        elif '-fastcomp' in arg:
-          arg = arg.replace('-fastcomp', '')
-          backend = 'fastcomp'
-        arg = arg.replace('sdk-', '').replace('-64bit', '').replace('tag-', '')
-        release_hash = get_release_hash(arg, releases_info)
-        if release_hash:
-          if backend is None:
-            if version_key(arg) >= (1, 39, 0):
-              backend = 'upstream'
-            else:
-              backend = 'fastcomp'
-          sys.argv[i] = 'sdk-releases-%s-%s-64bit' % (backend, release_hash)
+      sys.argv[i] = expand_sdk_name(sys.argv[i])
 
   if cmd == 'list':
     print('')
@@ -2879,6 +2883,7 @@ def installed_sdk_text(name):
       key=lambda x: [int(v) if v.isdigit() else -1 for v in x.split('.')],
       reverse=True,
     )
+    releases_info = load_releases_info()['releases']
     for ver in releases_versions:
       print('         %s    %s' % (ver, installed_sdk_text('sdk-releases-upstream-%s-64bit' % get_release_hash(ver, releases_info))))
     print()

From 16d4ec5489ab98e42a5ef25cfe9d6223ae2fc29b Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Fri, 7 Aug 2020 09:06:46 -0700
Subject: [PATCH 052/161] Disallow fastcomp in tot and 2.0.0+ (#584)

---
 emsdk.py        | 6 +++++-
 scripts/test.py | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 1f57332f1b..783fa3bec9 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2648,7 +2648,8 @@ def expand_sdk_name(name):
   elif name == 'tot-upstream':
     return str(find_tot_sdk('upstream'))
   elif name in ('tot-fastcomp', 'sdk-nightly-latest'):
-    return str(find_tot_sdk('fastcomp'))
+    print('error: The fastcomp compiler is not available tot/nightly builds. Please use the upstream llvm backend or use an older version than 2.0.0.')
+    sys.exit(1)
   else:
     # check if it's a release handled by an emscripten-releases version,
     # and if so use that by using the right hash. we support a few notations,
@@ -2664,6 +2665,9 @@ def expand_sdk_name(name):
       fullname = fullname.replace('-fastcomp', '')
       backend = 'fastcomp'
     fullname = fullname.replace('sdk-', '').replace('-64bit', '').replace('tag-', '')
+    if backend == 'fastcomp' and version_key(fullname) >= (2, 0, 0):
+      print('error: The fastcomp compiler is not available in 2.0.0+. Please use the upstream llvm backend or use an older version than 2.0.0.')
+      sys.exit(1)
     releases_info = load_releases_info()['releases']
     release_hash = get_release_hash(fullname, releases_info)
     if release_hash:
diff --git a/scripts/test.py b/scripts/test.py
index ba8d96fd68..c34aba5d33 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -169,11 +169,6 @@ def run_emsdk(cmd):
 # TODO; test on latest as well
 check_call(upstream_emcc + ' hello_world.c')
 
-print('test tot-fastcomp')
-run_emsdk('install tot-fastcomp')
-run_emsdk('activate tot-fastcomp')
-check_call(fastcomp_emcc + ' hello_world.c')
-
 print('test specific release (old)')
 run_emsdk('install sdk-fastcomp-1.38.31-64bit')
 run_emsdk('activate sdk-fastcomp-1.38.31-64bit')

From 1e5c650388424a526ac9fa2f3e1ac401f72f1888 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 7 Aug 2020 11:26:32 -0700
Subject: [PATCH 053/161] Log warnings to stderr (#585)

Its particularly important during `construct_env` where stdout
is directly interpreted by the shell.

See: #385
---
 emsdk.py | 119 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 60 insertions(+), 59 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 783fa3bec9..a0a7fe00af 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -51,6 +51,11 @@
 if os.name == 'nt' or (os.getenv('SYSTEMROOT') is not None and 'windows' in os.getenv('SYSTEMROOT').lower()) or (os.getenv('COMSPEC') is not None and 'windows' in os.getenv('COMSPEC').lower()):
   WINDOWS = True
 
+
+def errlog(msg):
+  print(msg, file=sys.stderr)
+
+
 MINGW = False
 MSYS = False
 if os.getenv('MSYSTEM'):
@@ -62,7 +67,7 @@
     MINGW = True
   if os.getenv('MSYSTEM') != 'MSYS' and os.getenv('MSYSTEM') != 'MINGW64':
     # https://stackoverflow.com/questions/37460073/msys-vs-mingw-internal-environment-variables
-    print('Warning: MSYSTEM environment variable is present, and is set to "' + os.getenv('MSYSTEM') + '". This shell has not been tested with emsdk and may not work.')
+    errlog('Warning: MSYSTEM environment variable is present, and is set to "' + os.getenv('MSYSTEM') + '". This shell has not been tested with emsdk and may not work.')
 
 MACOS = False
 if platform.mac_ver()[0] != '':
@@ -107,8 +112,8 @@
 elif platform.machine().startswith('arm'):
   ARCH = 'arm'
 else:
-  print("Warning: unknown machine architecture " + machine)
-  print()
+  errlog("Warning: unknown machine architecture " + machine)
+  errlog()
 
 # Don't saturate all cores to not steal the whole system, but be aggressive.
 CPU_CORES = int(os.environ.get('EMSDK_NUM_CORES', max(multiprocessing.cpu_count() - 1, 1)))
@@ -316,8 +321,8 @@ def win_set_environment_variable_direct(key, value, system=True):
     # 'Access is denied.'
     if e.args[0] == 5:
       exit_with_error('Error! Failed to set the environment variable \'' + key + '\'! Setting environment variables permanently requires administrator access. Please rerun this command with administrative privileges. This can be done for example by holding down the Ctrl and Shift keys while opening a command prompt in start menu.')
-    print('Failed to write environment variable ' + key + ':', file=sys.stderr)
-    print(str(e), file=sys.stderr)
+    errlog('Failed to write environment variable ' + key + ':')
+    errlog(str(e))
     win32api.RegCloseKey(folder)
     os.environ['PATH'] = prev_path
     return None
@@ -353,8 +358,8 @@ def win_get_environment_variable(key, system=True):
   except Exception as e:
     if e.args[0] != 2:
       # 'The system cannot find the file specified.'
-      print('Failed to read environment variable ' + key + ':', file=sys.stderr)
-      print(str(e), file=sys.stderr)
+      errlog('Failed to read environment variable ' + key + ':')
+      errlog(str(e))
     try:
       win32api.RegCloseKey(folder)
     except Exception:
@@ -405,16 +410,16 @@ def win_set_environment_variable(key, value, system=True):
     # Escape % signs so that we don't expand references to environment variables.
     value = value.replace('%', '^%')
     if len(value) >= 1024:
-      exit_with_error('ERROR! The new environment variable ' + key + ' is more than 1024 characters long! A value this long cannot be set via command line: please add the environment variable specified above to system environment manually via Control Panel.', file=sys.stderr)
+      exit_with_error('ERROR! The new environment variable ' + key + ' is more than 1024 characters long! A value this long cannot be set via command line: please add the environment variable specified above to system environment manually via Control Panel.')
     cmd = ['SETX', key, value]
     debug_print(str(cmd))
     retcode = subprocess.call(cmd, stdout=subprocess.PIPE)
     if retcode != 0:
-      print('ERROR! Failed to set environment variable ' + key + '=' + value + '. You may need to set it manually.', file=sys.stderr)
+      errlog('ERROR! Failed to set environment variable ' + key + '=' + value + '. You may need to set it manually.')
   except Exception as e:
-    print('ERROR! Failed to set environment variable ' + key + '=' + value + ':', file=sys.stderr)
-    print(str(e), file=sys.stderr)
-    print('You may need to set it manually.', file=sys.stderr)
+    errlog('ERROR! Failed to set environment variable ' + key + '=' + value + ':')
+    errlog(str(e))
+    errlog('You may need to set it manually.')
 
 
 def win_delete_environment_variable(key, system=True):
@@ -512,7 +517,7 @@ def fix_potentially_long_windows_pathname(pathname):
     return pathname
   # Test if emsdk calls fix_potentially_long_windows_pathname() with long relative paths (which is problematic)
   if not os.path.isabs(pathname) and len(pathname) > 200:
-    print('Warning: Seeing a relative path "' + pathname + '" which is dangerously long for being referenced as a short Windows path name. Refactor emsdk to be able to handle this!')
+    errlog('Warning: Seeing a relative path "' + pathname + '" which is dangerously long for being referenced as a short Windows path name. Refactor emsdk to be able to handle this!')
   if pathname.startswith('\\\\?\\'):
     return pathname
   pathname = os.path.normpath(pathname.replace('/', '\\'))
@@ -701,9 +706,9 @@ def download_file(url, dstpath, download_even_if_exists=False, filename_prefix='
         print(']')
         sys.stdout.flush()
   except Exception as e:
-    print("Error: Downloading URL '" + url + "': " + str(e))
+    errlog("Error: Downloading URL '" + url + "': " + str(e))
     if "SSL: CERTIFICATE_VERIFY_FAILED" in str(e) or "urlopen error unknown url type: https" in str(e):
-      print("Warning: Possibly SSL/TLS issue. Update or install Python SSL root certificates (2048-bit or greater) supplied in Python folder or https://pypi.org/project/certifi/ and try again.")
+      errlog("Warning: Possibly SSL/TLS issue. Update or install Python SSL root certificates (2048-bit or greater) supplied in Python folder or https://pypi.org/project/certifi/ and try again.")
     rmfile(file_name)
     return None
   except KeyboardInterrupt:
@@ -967,13 +972,13 @@ def make_build(build_root, build_type, build_target_platform='x64'):
     print('Running build: ' + str(make))
     ret = subprocess.check_call(make, cwd=build_root, env=build_env(generator_to_use))
     if ret != 0:
-      print('Build failed with exit code ' + ret + '!', file=sys.stderr)
-      print('Working directory: ' + build_root, file=sys.stderr)
+      errlog('Build failed with exit code ' + ret + '!')
+      errlog('Working directory: ' + build_root)
       return False
   except Exception as e:
-    print('Build failed due to exception!', file=sys.stderr)
-    print('Working directory: ' + build_root, file=sys.stderr)
-    print(str(e), file=sys.stderr)
+    errlog('Build failed due to exception!')
+    errlog('Working directory: ' + build_root)
+    errlog(str(e))
     return False
 
   return True
@@ -1004,25 +1009,25 @@ def quote_parens(x):
     open(os.path.join(build_root, 'recmake.' + ('bat' if WINDOWS else 'sh')), 'w').write(' '.join(map(quote_parens, cmdline)))
     ret = subprocess.check_call(cmdline, cwd=build_root, env=build_env(CMAKE_GENERATOR))
     if ret != 0:
-      print('CMake invocation failed with exit code ' + ret + '!', file=sys.stderr)
-      print('Working directory: ' + build_root, file=sys.stderr)
+      errlog('CMake invocation failed with exit code ' + ret + '!')
+      errlog('Working directory: ' + build_root)
       return False
   except OSError as e:
     if e.errno == errno.ENOENT:
-      print(str(e), file=sys.stderr)
-      print('Could not run CMake, perhaps it has not been installed?', file=sys.stderr)
+      errlog(str(e))
+      errlog('Could not run CMake, perhaps it has not been installed?')
       if WINDOWS:
-        print('Installing this package requires CMake. Get it from http://www.cmake.org/', file=sys.stderr)
+        errlog('Installing this package requires CMake. Get it from http://www.cmake.org/')
       elif LINUX:
-        print('Installing this package requires CMake. Get it via your system package manager (e.g. sudo apt-get install cmake), or from http://www.cmake.org/', file=sys.stderr)
+        errlog('Installing this package requires CMake. Get it via your system package manager (e.g. sudo apt-get install cmake), or from http://www.cmake.org/')
       elif MACOS:
-        print('Installing this package requires CMake. Get it via a macOS package manager (Homebrew: "brew install cmake", or MacPorts: "sudo port install cmake"), or from http://www.cmake.org/', file=sys.stderr)
+        errlog('Installing this package requires CMake. Get it via a macOS package manager (Homebrew: "brew install cmake", or MacPorts: "sudo port install cmake"), or from http://www.cmake.org/')
       return False
     raise
   except Exception as e:
-    print('CMake invocation failed due to exception!', file=sys.stderr)
-    print('Working directory: ' + build_root, file=sys.stderr)
-    print(str(e), file=sys.stderr)
+    errlog('CMake invocation failed due to exception!')
+    errlog('Working directory: ' + build_root)
+    errlog(str(e))
     return False
 
   return True
@@ -2112,8 +2117,8 @@ def is_emsdk_sourced_from_github():
 
 def update_emsdk():
   if is_emsdk_sourced_from_github():
-    print('You seem to have bootstrapped Emscripten SDK by cloning from GitHub. In this case, use "git pull" instead of "emsdk update" to update emsdk. (Not doing that automatically in case you have local changes)', file=sys.stderr)
-    print('Alternatively, use "emsdk update-tags" to refresh the latest list of tags from the different Git repositories.', file=sys.stderr)
+    errlog('You seem to have bootstrapped Emscripten SDK by cloning from GitHub. In this case, use "git pull" instead of "emsdk update" to update emsdk. (Not doing that automatically in case you have local changes)')
+    errlog('Alternatively, use "emsdk update-tags" to refresh the latest list of tags from the different Git repositories.')
     sys.exit(1)
   if not download_and_unzip(emsdk_zip_download_url, emsdk_path(), download_even_if_exists=True, clobber=False):
     sys.exit(1)
@@ -2174,7 +2179,7 @@ def load_llvm_precompiled_tags_64bit():
 
 
 def exit_with_error(msg):
-  sys.stdout.write(str(msg) + '\n')
+  errlog(str(msg))
   sys.exit(1)
 
 
@@ -2348,7 +2353,7 @@ def remove_nonexisting_tools(tool_list, log_errors=True):
     tool = tool_list[i]
     if not tool.is_installed():
       if log_errors:
-        print("Warning: The SDK/tool '" + str(tool) + "' cannot be activated since it is not installed! Skipping this tool...")
+        errlog("Warning: The SDK/tool '" + str(tool) + "' cannot be activated since it is not installed! Skipping this tool...")
       tool_list.pop(i)
       continue
     i += 1
@@ -2563,10 +2568,6 @@ def adjusted_path(tools_to_activate, log_additions=False, system_path_only=False
   return (separator.join(whole_path), new_emsdk_tools)
 
 
-def log_stderr(msg):
-  sys.stderr.write(str(msg) + '\n')
-
-
 def construct_env(tools_to_activate):
   env_string = ''
   newpath, added_path = adjusted_path(tools_to_activate)
@@ -2585,10 +2586,10 @@ def construct_env(tools_to_activate):
       assert False
 
     if added_path:
-      log_stderr('Adding directories to PATH:')
+      errlog('Adding directories to PATH:')
       for item in added_path:
-        log_stderr('PATH += ' + item)
-      log_stderr('')
+        errlog('PATH += ' + item)
+      errlog('')
 
   # A core variable EMSDK points to the root of Emscripten SDK directory.
   env_vars = [('EMSDK', to_unix_path(emsdk_path()))]
@@ -2611,7 +2612,7 @@ def construct_env(tools_to_activate):
       env_vars += [(key, value)]
 
   if env_vars:
-    log_stderr('Setting environment variables:')
+    errlog('Setting environment variables:')
     for key, value in env_vars:
       if POWERSHELL:
         env_string += '$env:' + key + '="' + value + '"\n'
@@ -2623,15 +2624,15 @@ def construct_env(tools_to_activate):
         env_string += 'export ' + key + '="' + value + '";\n'
       else:
         assert False
-      log_stderr(key + ' = ' + value)
+      errlog(key + ' = ' + value)
   return env_string
 
 
 def error_on_missing_tool(name):
   if name.endswith('-64bit') and not is_os_64bit():
-    print("Error: '%s' is only provided for 64-bit OSes." % name)
+    errlog("Error: '%s' is only provided for 64-bit OSes." % name)
   else:
-    print("Error: No tool or SDK found by name '%s'." % name)
+    errlog("Error: No tool or SDK found by name '%s'." % name)
   return 1
 
 
@@ -2684,7 +2685,7 @@ def main():
   global BUILD_FOR_TESTING, ENABLE_LLVM_ASSERTIONS, TTY_OUTPUT
 
   if len(sys.argv) <= 1:
-    print("Missing command; Type 'emsdk help' to get a list of commands.")
+    errlog("Missing command; Type 'emsdk help' to get a list of commands.")
     return 1
   if sys.argv[1] in ('help', '--help', '-h'):
     print(' emsdk: Available commands:')
@@ -2806,9 +2807,9 @@ def extract_bool_arg(name):
   arg_uses = extract_bool_arg('--uses')
   arg_global = extract_bool_arg('--global')
   if extract_bool_arg('--embedded'):
-    print('embedded mode is now the only mode available', file=sys.stderr)
+    errlog('embedded mode is now the only mode available')
   if extract_bool_arg('--no-embedded'):
-    print('embedded mode is now the only mode available', file=sys.stderr)
+    errlog('embedded mode is now the only mode available')
     return 1
 
   arg_notty = extract_bool_arg('--notty')
@@ -2833,7 +2834,7 @@ def extract_bool_arg(name):
         CMAKE_GENERATOR = build_generator.group(1)
         sys.argv[i] = ''
       else:
-        print("Cannot parse CMake generator string: " + sys.argv[i] + ". Try wrapping generator string with quotes", file=sys.stderr)
+        errlog("Cannot parse CMake generator string: " + sys.argv[i] + ". Try wrapping generator string with quotes")
         return 1
     elif sys.argv[i].startswith('--build='):
       build_type = re.match(r'^--build=(.+)$', sys.argv[i])
@@ -2846,10 +2847,10 @@ def extract_bool_arg(name):
           CMAKE_BUILD_TYPE_OVERRIDE = build_types[build_type_index]
           sys.argv[i] = ''
         except:
-          print('Unknown CMake build type "' + build_type + '" specified! Please specify one of ' + str(build_types), file=sys.stderr)
+          errlog('Unknown CMake build type "' + build_type + '" specified! Please specify one of ' + str(build_types))
           return 1
       else:
-        print("Invalid command line parameter " + sys.argv[i] + ' specified!', file=sys.stderr)
+        errlog("Invalid command line parameter " + sys.argv[i] + ' specified!')
         return 1
   sys.argv = [x for x in sys.argv if not len(x) == 0]
 
@@ -3014,14 +3015,14 @@ def print_tools(t):
         return error_on_missing_tool(arg)
       tools_to_activate += [tool]
     if not tools_to_activate:
-      print('No tools/SDKs specified to activate! Usage:\n   emsdk activate tool/sdk1 [tool/sdk2] [...]')
+      errlog('No tools/SDKs specified to activate! Usage:\n   emsdk activate tool/sdk1 [tool/sdk2] [...]')
       return 1
     active_tools = set_active_tools(tools_to_activate, permanently_activate=arg_global)
     if not active_tools:
-      print('No tools/SDKs found to activate! Usage:\n   emsdk activate tool/sdk1 [tool/sdk2] [...]')
+      errlog('No tools/SDKs found to activate! Usage:\n   emsdk activate tool/sdk1 [tool/sdk2] [...]')
       return 1
     if WINDOWS and not arg_global:
-      print('The changes made to environment variables only apply to the currently running shell instance. Use the \'emsdk_env.bat\' to re-enter this environment later, or if you\'d like to permanently register this environment globally to all users in Windows Registry, rerun this command with the option --global.')
+      errlog('The changes made to environment variables only apply to the currently running shell instance. Use the \'emsdk_env.bat\' to re-enter this environment later, or if you\'d like to permanently register this environment globally to all users in Windows Registry, rerun this command with the option --global.')
     return 0
   elif cmd == 'install':
     # Process args
@@ -3033,7 +3034,7 @@ def print_tools(t):
           CPU_CORES = int(multicore.group(1))
           sys.argv[i] = ''
         else:
-          print("Invalid command line parameter " + sys.argv[i] + ' specified!', file=sys.stderr)
+          errlog("Invalid command line parameter " + sys.argv[i] + ' specified!')
           return 1
       elif sys.argv[i] == '--shallow':
         global GIT_CLONE_SHALLOW
@@ -3050,7 +3051,7 @@ def print_tools(t):
         sys.argv[i] = ''
     sys.argv = [x for x in sys.argv if not len(x) == 0]
     if len(sys.argv) <= 2:
-      print("Missing parameter. Type 'emsdk install <tool name>' to install a tool or an SDK. Type 'emsdk list' to obtain a list of available tools. Type 'emsdk install latest' to automatically install the newest version of the SDK.")
+      errlog("Missing parameter. Type 'emsdk install <tool name>' to install a tool or an SDK. Type 'emsdk list' to obtain a list of available tools. Type 'emsdk install latest' to automatically install the newest version of the SDK.")
       return 1
     for t in sys.argv[2:]:
       tool = find_tool(t)
@@ -3064,16 +3065,16 @@ def print_tools(t):
     return 0
   elif cmd == 'uninstall':
     if len(sys.argv) <= 2:
-      print("Syntax error. Call 'emsdk uninstall <tool name>'. Call 'emsdk list' to obtain a list of available tools.")
+      errlog("Syntax error. Call 'emsdk uninstall <tool name>'. Call 'emsdk list' to obtain a list of available tools.")
       return 1
     tool = find_tool(sys.argv[2])
     if tool is None:
-      print("Error: Tool by name '" + sys.argv[2] + "' was not found.")
+      errlog("Error: Tool by name '" + sys.argv[2] + "' was not found.")
       return 1
     tool.uninstall()
     return 0
 
-  print("Unknown command '" + cmd + "' given! Type 'emsdk help' to get a list of commands.")
+  errlog("Unknown command '" + cmd + "' given! Type 'emsdk help' to get a list of commands.")
   return 1
 
 

From 839c1084797e56e3f02d9d3f6f99f1ba8805555f Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 10 Aug 2020 17:12:56 -0700
Subject: [PATCH 054/161] 2.0.0! (#586)

---
 emscripten-releases-tags.txt | 3 ++-
 emsdk.py                     | 7 +++++--
 scripts/test.py              | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index e2d8c9dee0..9a7932e6cb 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "1.40.1",
+  "latest": "2.0.0",
   "releases": {
+    "2.0.0":   "5974288502aab433d45f53511e961aaca4079d86",
     "1.40.1":  "536568644fd67d53778f6111fdd5f64ad3f4c539",
     "1.40.0":  "edf24e7233e0def312a08cc8dcec63a461155da1",
     "1.39.20": "e7e39da9c81faecd9ecf44065cee864d76e4e34d",
diff --git a/emsdk.py b/emsdk.py
index a0a7fe00af..0b7a4a2ce9 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2637,11 +2637,14 @@ def error_on_missing_tool(name):
 
 
 def expand_sdk_name(name):
+  if name in ('latest-fastcomp', 'latest-releases-fastcomp'):
+    # Since we no longer support fastcomp in ToT emscripten, the latest
+    # fastcomp release is fixed at 1.40.1.
+    name = 'sdk-fastcomp-1.40.1'
+
   if name in ('latest', 'sdk-latest', 'latest-64bit', 'sdk-latest-64bit'):
     # This is effectly the default SDK
     return str(find_latest_releases_sdk('upstream'))
-  elif name in ('latest-fastcomp', 'latest-releases-fastcomp'):
-    return str(find_latest_releases_sdk('fastcomp'))
   elif name in ('latest-upstream', 'latest-clang-upstream', 'latest-releases-upstream'):
     return str(find_latest_releases_sdk('upstream'))
   elif name in ('tot', 'sdk-tot'):
diff --git a/scripts/test.py b/scripts/test.py
index c34aba5d33..03a1acebfc 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -148,8 +148,8 @@ def run_emsdk(cmd):
 assert 'upstream' not in open(emconfig).read()
 assert 'fastcomp' in open(emconfig).read()
 
-print('verify version')
-checked_call_with_output(fastcomp_emcc + ' -v', TAGS['latest'], stderr=subprocess.STDOUT)
+print('verify latest fastcomp version is fixed at 1.40.1')
+checked_call_with_output(fastcomp_emcc + ' -v', '1.40.1', stderr=subprocess.STDOUT)
 
 print('clear cache')
 check_call(upstream_emcc + ' --clear-cache')

From ff8a62a3fb9214aaaa111a2c0a488985002873fc Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 11 Aug 2020 11:51:47 -0700
Subject: [PATCH 055/161] Pre-bundle requests module with macOS bundles python
 (#589)

The problem is that python can have trouble finding the default
certifcate set on macOS.  The actual bundle is installed by the certifi
package which the requests module uses under the hood.

Fixes: #588
---
 emsdk_manifest.json      | 16 ++++++++--------
 scripts/update_python.py | 21 +++++++++++++++------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 2861604a1b..0c9150e033 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -290,10 +290,10 @@
   },
   {
     "id": "python",
-    "version": "3.7.4",
+    "version": "3.7.4-2",
     "bitness": 64,
     "arch": "x86_64",
-    "macos_url": "python-3.7.4-macos.tar.gz",
+    "macos_url": "python-3.7.4-2-macos.tar.gz",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
     "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3"
@@ -485,7 +485,7 @@
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "macos"
   },
   {
@@ -515,7 +515,7 @@
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "macos"
   },
   {
@@ -576,7 +576,7 @@
   {
     "version": "releases-upstream-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.18.1-64bit", "python-3.7.4-64bit", "releases-upstream-%releases-tag%-64bit"],
+    "uses": ["node-12.18.1-64bit", "python-3.7.4-2-64bit", "releases-upstream-%releases-tag%-64bit"],
     "os": "macos",
     "custom_install_script": "emscripten_npm_install"
   },
@@ -597,7 +597,7 @@
   {
     "version": "releases-fastcomp-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.18.1-64bit", "python-3.7.4-64bit", "releases-fastcomp-%releases-tag%-64bit"],
+    "uses": ["node-12.18.1-64bit", "python-3.7.4-2-64bit", "releases-fastcomp-%releases-tag%-64bit"],
     "os": "macos",
     "custom_install_script": "emscripten_npm_install"
   },
@@ -647,7 +647,7 @@
   {
     "version": "fastcomp-%precompiled_tag32%",
     "bitness": 32,
-    "uses": ["fastcomp-clang-e%precompiled_tag32%-32bit", "node-8.9.1-32bit", "python-3.7.4-64bit", "emscripten-%precompiled_tag32%"],
+    "uses": ["fastcomp-clang-e%precompiled_tag32%-32bit", "node-8.9.1-32bit", "python-3.7.4-2-64bit", "emscripten-%precompiled_tag32%"],
     "os": "macos",
     "version_filter": [
       ["%precompiled_tag32%", ">", "1.37.22"]
@@ -656,7 +656,7 @@
   {
     "version": "fastcomp-%precompiled_tag64%",
     "bitness": 64,
-    "uses": ["fastcomp-clang-e%precompiled_tag64%-64bit", "node-8.9.1-64bit", "python-3.7.4-64bit", "emscripten-%precompiled_tag64%"],
+    "uses": ["fastcomp-clang-e%precompiled_tag64%-64bit", "node-8.9.1-64bit", "python-3.7.4-2-64bit", "emscripten-%precompiled_tag64%"],
     "os": "macos",
     "version_filter": [
       ["%precompiled_tag64%", ">", "1.37.22"]
diff --git a/scripts/update_python.py b/scripts/update_python.py
index e1f81e37a0..10142dad3c 100755
--- a/scripts/update_python.py
+++ b/scripts/update_python.py
@@ -32,6 +32,7 @@
 
 version = '3.7.4'
 base = 'https://www.python.org/ftp/python/%s/' % version
+revision = '2'
 
 pywin32_version = '227'
 pywin32_base = 'https://github.com/mhammond/pywin32/releases/download/b%s/' % pywin32_version
@@ -100,13 +101,21 @@ def build_python():
     check_call(['make', 'install', 'DESTDIR=install'], cwd=src_dir)
 
     install_dir = os.path.join(src_dir, 'install')
-    os.rename(os.path.join(install_dir, 'usr', 'local'), 'python-%s' % version)
-    tarball = 'python-%s-%s.tar.gz' % (version, osname)
-    shutil.rmtree(os.path.join('python-%s' % version, 'lib', 'python3.7', 'test'))
-    shutil.rmtree(os.path.join('python-%s' % version, 'include'))
-    for lib in glob.glob(os.path.join('python-%s' % version, 'lib', 'lib*.a')):
+
+    # Install requests module.  This is needed in particualr on macOS to ensure
+    # SSL certificates are available (certifi in installed and used by requests).
+    pybin = os.path.join(src_dir, 'install', 'usr', 'local', 'bin', 'python3')
+    pip = os.path.join(src_dir, 'install', 'usr', 'local', 'bin', 'pip3')
+    check_call([pybin, pip, 'install', 'requests'])
+
+    dirname = 'python-%s-%s' % (version, revision)
+    os.rename(os.path.join(install_dir, 'usr', 'local'), dirname)
+    tarball = 'python-%s-%s-%s.tar.gz' % (version, revision, osname)
+    shutil.rmtree(os.path.join(dirname, 'lib', 'python3.7', 'test'))
+    shutil.rmtree(os.path.join(dirname, 'include'))
+    for lib in glob.glob(os.path.join(dirname, 'lib', 'lib*.a')):
       os.remove(lib)
-    check_call(['tar', 'zcvf', tarball, 'python-%s' % version])
+    check_call(['tar', 'zcvf', tarball, dirname])
     print('Uploading: ' + upload_base + tarball)
     check_call(['gsutil', 'cp', '-n', tarball, upload_base + tarball])
 

From 6adb624e04b0c6a0f4c5c06d3685f4ca2be7691d Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Tue, 11 Aug 2020 15:10:43 -0700
Subject: [PATCH 056/161] Error on trying to get latest-fastcomp (#590)

I think this is less surprising than continuing to support latest-fastcomp
with the last fastcomp release. That's technically correct - the last release
is 1.40.1, and always will be - but when a user asks for "latest" I think they
want something up to date. Instead, give a clear error that indicates how
they can get an actually up to date build, by using upstream.
---
 emsdk.py        | 17 +++++++----------
 scripts/test.py | 23 ++++++++++++++++-------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 0b7a4a2ce9..89e9d68f7d 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2636,12 +2636,13 @@ def error_on_missing_tool(name):
   return 1
 
 
-def expand_sdk_name(name):
-  if name in ('latest-fastcomp', 'latest-releases-fastcomp'):
-    # Since we no longer support fastcomp in ToT emscripten, the latest
-    # fastcomp release is fixed at 1.40.1.
-    name = 'sdk-fastcomp-1.40.1'
+def exit_with_fastcomp_error():
+    exit_with_error('The fastcomp backend is not getting new builds or releases. Please use the upstream llvm backend or use an older version than 2.0.0 (such as 1.40.1).')
+
 
+def expand_sdk_name(name):
+  if name in ('latest-fastcomp', 'latest-releases-fastcomp', 'tot-fastcomp', 'sdk-nightly-latest'):
+    exit_with_fastcomp_error()
   if name in ('latest', 'sdk-latest', 'latest-64bit', 'sdk-latest-64bit'):
     # This is effectly the default SDK
     return str(find_latest_releases_sdk('upstream'))
@@ -2651,9 +2652,6 @@ def expand_sdk_name(name):
     return str(find_tot_sdk('upstream'))
   elif name == 'tot-upstream':
     return str(find_tot_sdk('upstream'))
-  elif name in ('tot-fastcomp', 'sdk-nightly-latest'):
-    print('error: The fastcomp compiler is not available tot/nightly builds. Please use the upstream llvm backend or use an older version than 2.0.0.')
-    sys.exit(1)
   else:
     # check if it's a release handled by an emscripten-releases version,
     # and if so use that by using the right hash. we support a few notations,
@@ -2670,8 +2668,7 @@ def expand_sdk_name(name):
       backend = 'fastcomp'
     fullname = fullname.replace('sdk-', '').replace('-64bit', '').replace('tag-', '')
     if backend == 'fastcomp' and version_key(fullname) >= (2, 0, 0):
-      print('error: The fastcomp compiler is not available in 2.0.0+. Please use the upstream llvm backend or use an older version than 2.0.0.')
-      sys.exit(1)
+      exit_with_fastcomp_error()
     releases_info = load_releases_info()['releases']
     release_hash = get_release_hash(fullname, releases_info)
     if release_hash:
diff --git a/scripts/test.py b/scripts/test.py
index 03a1acebfc..beee4ace8d 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -60,10 +60,13 @@ def checked_call_with_output(cmd, expected=None, unexpected=None, stderr=None):
 
 
 def failing_call_with_output(cmd, expected):
-  proc = subprocess.Popen(cmd.split(' '), stdout=subprocess.PIPE, universal_newlines=True)
+  proc = subprocess.Popen(cmd.split(' '), stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
   stdout, stderr = proc.communicate()
-  assert proc.returncode, 'call must have failed'
-  assert expected in stdout, 'call did not have the right output'
+  if WINDOWS:
+    print('warning: skipping part of failing_call_with_output() due to error codes not being propagated (see #592)')
+  else:
+    assert proc.returncode, 'call must have failed: ' + str([stdout, "\n========\n", stderr])
+  assert expected in stdout or expected in stderr, 'call did not have the right output'
 
 
 def hack_emsdk(marker, replacement):
@@ -139,9 +142,9 @@ def run_emsdk(cmd):
 print('update')
 run_emsdk('update-tags')
 
-print('test latest-releases-fastcomp')
-run_emsdk('install latest-fastcomp')
-run_emsdk('activate latest-fastcomp')
+print('test the last fastcomp release')
+run_emsdk('install 1.40.1-fastcomp')
+run_emsdk('activate 1.40.1-fastcomp')
 
 test_lib_building(fastcomp_emcc, use_asmjs_optimizer=False)
 assert open(emconfig).read().count('LLVM_ROOT') == 1
@@ -151,6 +154,12 @@ def run_emsdk(cmd):
 print('verify latest fastcomp version is fixed at 1.40.1')
 checked_call_with_output(fastcomp_emcc + ' -v', '1.40.1', stderr=subprocess.STDOUT)
 
+print('verify that attempting to use newer fastcomp gives an error')
+fastcomp_error = 'The fastcomp backend is not getting new builds or releases. Please use the upstream llvm backend or use an older version than 2.0.0 (such as 1.40.1).'
+failing_call_with_output(emsdk + ' install latest-fastcomp', fastcomp_error)
+failing_call_with_output(emsdk + ' install tot-fastcomp', fastcomp_error)
+failing_call_with_output(emsdk + ' install 2.0.0-fastcomp', fastcomp_error)
+
 print('clear cache')
 check_call(upstream_emcc + ' --clear-cache')
 assert not os.path.exists(LIBC)
@@ -169,7 +178,7 @@ def run_emsdk(cmd):
 # TODO; test on latest as well
 check_call(upstream_emcc + ' hello_world.c')
 
-print('test specific release (old)')
+print('test specific release (old, using sdk-* notation)')
 run_emsdk('install sdk-fastcomp-1.38.31-64bit')
 run_emsdk('activate sdk-fastcomp-1.38.31-64bit')
 

From 721ef8f47699962f7bb14d562736c056b21cb2d4 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Fri, 21 Aug 2020 12:56:57 -0700
Subject: [PATCH 057/161] 2.0.1 (#596)

Also fix the test - we can't activate fastcomp and call upstream's emcc to
even clear the cache, as it disallows fastcomp's LLVM.
---
 emscripten-releases-tags.txt | 3 ++-
 scripts/test.py              | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 9a7932e6cb..80278e7e8b 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.0",
+  "latest": "2.0.1",
   "releases": {
+    "2.0.1":   "13e29bd55185e3c12802bc090b4507901856b2ba",
     "2.0.0":   "5974288502aab433d45f53511e961aaca4079d86",
     "1.40.1":  "536568644fd67d53778f6111fdd5f64ad3f4c539",
     "1.40.0":  "edf24e7233e0def312a08cc8dcec63a461155da1",
diff --git a/scripts/test.py b/scripts/test.py
index beee4ace8d..2b0134c5fd 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -160,6 +160,9 @@ def run_emsdk(cmd):
 failing_call_with_output(emsdk + ' install tot-fastcomp', fastcomp_error)
 failing_call_with_output(emsdk + ' install 2.0.0-fastcomp', fastcomp_error)
 
+print('go back to using upstream')
+run_emsdk('activate latest')
+
 print('clear cache')
 check_call(upstream_emcc + ' --clear-cache')
 assert not os.path.exists(LIBC)

From c1f0ad9fcd80418b9fa27a821625460e68d806fc Mon Sep 17 00:00:00 2001
From: Bob Tolbert <oa@tolbert.org>
Date: Sat, 22 Aug 2020 12:31:16 -0600
Subject: [PATCH 058/161] Fix emsdk_env.sh for multiple shells (#594)

This change allows sourcing emsdk_env.sh from bash, zsh and
ksh.

The script works out the true location of the emsdk directory,
even if it is a symlink or the script itself is a symlink.

Added a test in scripts/test_source_env.sh to try sourcing via
all the shells and with various paths.

Co-authored-by: Bob Tolbert <bob@tolbert.org>
---
 .circleci/config.yml       |   3 +-
 emsdk_env.sh               |  65 +++++++++++++++---
 scripts/test_source_env.sh | 132 +++++++++++++++++++++++++++++++++++++
 3 files changed, 189 insertions(+), 11 deletions(-)
 create mode 100755 scripts/test_source_env.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f4a2db283e..36acaf1304 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,8 +34,9 @@ jobs:
       - checkout
       - run:
           name: Install debian packages
-          command: apt-get update -q && apt-get install -q -y cmake build-essential openjdk-8-jre-headless
+          command: apt-get update -q && apt-get install -q -y cmake build-essential openjdk-8-jre-headless ksh zsh
       - run: scripts/test.sh
+      - run: scripts/test_source_env.sh
       - run:
           name: test.py
           command: |
diff --git a/emsdk_env.sh b/emsdk_env.sh
index 2b57fda3ec..734125548e 100644
--- a/emsdk_env.sh
+++ b/emsdk_env.sh
@@ -1,26 +1,71 @@
 # This script is sourced by the user and uses
-# their shell. Try not to use bashisms.
-
+# their shell.
+#
+# This script tries to find its location but
+# this does not work in every shell.
+#
+# It is known to work in bash, zsh and ksh
+#
 # Do not execute this script without sourcing,
 # because it won't have any effect then.
 # That is, always run this script with
 #
-#     . ./emsdk_env.sh
+#     . /path/to/emsdk_env.sh
+#
 # or
-#     source ./emsdk_env.sh
+#
+#     source /path/to/emsdk_env.sh
 #
 # instead of just plainly running with
 #
 #     ./emsdk_env.sh
 #
 # which won't have any effect.
-if [ -z "$BASH_SOURCE" ]; then
-  if [ ! -f "./emsdk.py" ]; then
-    echo "error: You must be in the same directory as emsdk_env.sh when sourcing it (or switch to the bash shell)" 1>&2
+
+CURRENT_SCRIPT=
+DIR="."
+
+# use shell specific method to get the path
+# to the current file being source'd.
+#
+# To add a shell, add another conditional below,
+# then add tests to scripts/test_source_env.sh
+
+if [ -n "$BASH_SOURCE" ]; then
+  CURRENT_SCRIPT="$BASH_SOURCE"
+elif [ -n "$ZSH_VERSION" ]; then
+  CURRENT_SCRIPT="${(%):-%x}"
+elif [ -n "$KSH_VERSION" ]; then
+  CURRENT_SCRIPT=${.sh.file}
+fi
+
+if [ -n "$CURRENT_SCRIPT" ]; then
+  DIR=$(dirname "$CURRENT_SCRIPT")
+  if [ -h "$CURRENT_SCRIPT" ]; then
+    # Now work out actual DIR since this is part of a symlink.
+    # Since we can't be sure that readlink or realpath
+    # are available, use tools more likely to be installed.
+    # (This will still fail if sed is not available.)
+    SYMDIR=$(dirname "$(ls -l "$CURRENT_SCRIPT" | sed -n "s/.*-> //p")")
+    if [ -z "$SYMDIR" ]; then
+      SYMDIR="."
+    fi
+    FULLDIR="$DIR/$SYMDIR"
+    DIR=$(cd "$FULLDIR" > /dev/null 2>&1; /bin/pwd)
+    unset SYMDIR
+    unset FULLDIR
   fi
-  DIR="."
-else
-  DIR="$(dirname "$BASH_SOURCE")"
+fi
+unset CURRENT_SCRIPT
+
+if [ ! -f "$DIR/emsdk.py" ]; then
+  echo "Error: unable to determine 'emsdk' directory. Perhaps you are using a shell or" 1>&2
+  echo "       environment that this script does not support." 1>&2
+  echo 1>&2
+  echo "A possible solution is to source this script while in the 'emsdk' directory." 1>&2
+  echo 1>&2
+  unset DIR
+  return
 fi
 
 # Force emsdk to use bash syntax so that this works in windows + bash too
diff --git a/scripts/test_source_env.sh b/scripts/test_source_env.sh
new file mode 100755
index 0000000000..71a3e4070a
--- /dev/null
+++ b/scripts/test_source_env.sh
@@ -0,0 +1,132 @@
+#!/usr/bin/env bash
+
+echo "Test ability to source emsdk_env.sh in different shells"
+
+if [ -n "$EMSDK" ]; then
+    echo "EMSDK is already defined in this shell. Run tests in a shell without sourcing emsdk_env.sh first"
+    exit 1
+fi
+
+DIR=$(dirname "$BASH_SOURCE")
+
+# setup a symlink relative to the current dir
+REL_LINK_DIR="$DIR/tmp"
+if [ -d "$REL_LINK_DIR" ]; then
+    rm -rf "$REL_LINK_DIR"
+fi
+echo "Creating links in $REL_LINK_DIR"
+mkdir -p "$REL_LINK_DIR"
+(cd $DIR/.. && ln -s `pwd` "$REL_LINK_DIR/emsdk")
+(cd $DIR/.. && ln -s `pwd`/emsdk_env.sh "$REL_LINK_DIR")
+
+# setup a symlink in an absolute directory
+ABS_LINK_DIR="/tmp/emsdk_env_test"
+if [ -d "$ABS_LINK_DIR" ]; then
+    rm -rf "$ABS_LINK_DIR"
+fi
+echo "Creating links in $ABS_LINK_DIR"
+mkdir -p "$ABS_LINK_DIR"
+(cd $DIR/.. && ln -s `pwd` "$ABS_LINK_DIR/emsdk")
+(cd $DIR/.. && ln -s `pwd`/emsdk_env.sh "$ABS_LINK_DIR")
+
+PATH1="$DIR/../emsdk_env.sh"
+PATH2="$REL_LINK_DIR/emsdk/emsdk_env.sh"
+PATH3="$REL_LINK_DIR/emsdk_env.sh"
+PATH4="$ABS_LINK_DIR/emsdk/emsdk_env.sh"
+PATH5="$ABS_LINK_DIR/emsdk_env.sh"
+
+assert_emcc() {
+    current=$1
+    cmd=$2
+    value=$3
+    if [ -z "$value" ] || [ "$value" == "false" ]; then
+        echo "FAILED:  $current"
+        echo "  unable to get EMSDK in $current using '$cmd'"
+    else
+        echo "SUCCESS: $current testing $cmd"
+        echo "  -> EMSDK = $value"
+    fi
+}
+
+test_bash() {
+    value=$(bash --rcfile <(echo $1))
+    assert_emcc bash "$1" "$value"
+}
+
+test_zsh() {
+    value=$(zsh -d -c "$1")
+    assert_emcc zsh "$1" "$value"
+}
+
+test_ksh() {
+    value=$(ksh -c "$1")
+    assert_emcc ksh "$1" "$value"
+}
+
+it_tests_direct_path() {
+    TEST_SCRIPT=". ${PATH1}"' >/dev/null 2>&1; if [ -n "$EMSDK" ]; then echo "$EMSDK"; else echo false; fi ; exit'
+    test_bash "$TEST_SCRIPT"
+    test_zsh "$TEST_SCRIPT"
+    test_ksh "$TEST_SCRIPT"
+    TEST_SCRIPT="source ${PATH1}"' >/dev/null 2>&1; if [ -n "$EMSDK" ]; then echo "$EMSDK"; else echo false; fi ; exit'
+    test_bash "$TEST_SCRIPT"
+    test_zsh "$TEST_SCRIPT"
+    test_ksh "$TEST_SCRIPT"
+}
+
+it_tests_via_relative_dir_symlink() {
+    TEST_SCRIPT=". ${PATH2}"' >/dev/null 2>&1; if [ -n "$EMSDK" ]; then echo "$EMSDK"; else echo false; fi ; exit'
+    test_bash "$TEST_SCRIPT"
+    test_zsh "$TEST_SCRIPT"
+    test_ksh "$TEST_SCRIPT"
+    TEST_SCRIPT="source ${PATH2}"' >/dev/null 2>&1; if [ -n "$EMSDK" ]; then echo "$EMSDK"; else echo false; fi ; exit'
+    test_bash "$TEST_SCRIPT"
+    test_zsh "$TEST_SCRIPT"
+    test_ksh "$TEST_SCRIPT"
+}
+
+it_tests_via_relative_file_symlink() {
+    TEST_SCRIPT=". ${PATH3}"' >/dev/null 2>&1; if [ -n "$EMSDK" ]; then echo "$EMSDK"; else echo false; fi ; exit'
+    test_bash "$TEST_SCRIPT"
+    test_zsh "$TEST_SCRIPT"
+    test_ksh "$TEST_SCRIPT"
+    TEST_SCRIPT="source ${PATH3}"' >/dev/null 2>&1; if [ -n "$EMSDK" ]; then echo "$EMSDK"; else echo false; fi ; exit'
+    test_bash "$TEST_SCRIPT"
+    test_zsh "$TEST_SCRIPT"
+    test_ksh "$TEST_SCRIPT"
+}
+
+it_tests_via_absolute_dir_symlink() {
+    TEST_SCRIPT=". ${PATH4}"' >/dev/null 2>&1; if [ -n "$EMSDK" ]; then echo "$EMSDK"; else echo false; fi ; exit'
+    test_bash "$TEST_SCRIPT"
+    test_zsh "$TEST_SCRIPT"
+    test_ksh "$TEST_SCRIPT"
+    TEST_SCRIPT="source ${PATH4}"' >/dev/null 2>&1; if [ -n "$EMSDK" ]; then echo "$EMSDK"; else echo false; fi ; exit'
+    test_bash "$TEST_SCRIPT"
+    test_zsh "$TEST_SCRIPT"
+    test_ksh "$TEST_SCRIPT"
+}
+
+it_tests_via_absolute_file_symlink() {
+    TEST_SCRIPT=". ${PATH5}"' >/dev/null 2>&1; if [ -n "$EMSDK" ]; then echo "$EMSDK"; else echo false; fi ; exit'
+    test_bash "$TEST_SCRIPT"
+    test_zsh "$TEST_SCRIPT"
+    test_ksh "$TEST_SCRIPT"
+    TEST_SCRIPT="source ${PATH5}"' >/dev/null 2>&1; if [ -n "$EMSDK" ]; then echo "$EMSDK"; else echo false; fi ; exit'
+    test_bash "$TEST_SCRIPT"
+    test_zsh "$TEST_SCRIPT"
+    test_ksh "$TEST_SCRIPT"
+}
+
+run_bash_tests() {
+    it_tests_direct_path
+    it_tests_via_relative_dir_symlink
+    it_tests_via_relative_file_symlink
+    it_tests_via_absolute_dir_symlink
+    it_tests_via_absolute_file_symlink
+}
+
+run_bash_tests
+
+rm -rf $REL_LINK_DIR
+rm -rf $ABS_LINK_DIR

From 9c27544f852442865874d97673dff80569da68ae Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 25 Aug 2020 15:40:41 -0700
Subject: [PATCH 059/161] Add stalebot (#601)

---
 .github/stale.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .github/stale.yml

diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 0000000000..1807a00f71
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 365
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 30
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because there has been no
+  activity in the past year.  It will be closed automatically if no further
+  activity occurs in the next 30 days.  Feel free to re-open at any time if this
+  issue is still relevant.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

From f6c9e453f88c80dcfcb41c869fb8235c486ef28d Mon Sep 17 00:00:00 2001
From: Reo <reosablo@users.noreply.github.com>
Date: Tue, 1 Sep 2020 00:27:03 +0900
Subject: [PATCH 060/161] Fix `emsdk activate` breaking configuration file
 (#602)

Fixes: #587

> If nodejs is not installed by `emsdk`, the output ".emscripten" file by `emsdk activate` will look like this.
>
> ```python
> NODE_JS = ''/usr/bin/nodejs''
> # too many quotes
> ```
>
> `emcc` fails to execute by this syntax error.
>
> I think fixing [this line](https://github.com/emscripten-core/emsdk/blob/1.40.1/emsdk.py#L1450) could be a solution.
>
> ```python
> activated_config['NODE_JS'] = "'%s'" % node_fallback
> # the value will be quoted later again
> ```
---
 emsdk.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index 89e9d68f7d..14ce8846b1 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -1452,7 +1452,7 @@ def generate_dot_emscripten(active_tools):
     node_fallback = which('nodejs')
     if not node_fallback:
       node_fallback = 'node'
-    activated_config['NODE_JS'] = "'%s'" % node_fallback
+    activated_config['NODE_JS'] = node_fallback
 
   for name, value in activated_config.items():
     cfg += name + " = '" + value + "'\n"

From 645d276b5c8f69ba856493e4aa08be104f983ad8 Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Wed, 2 Sep 2020 19:50:52 +0200
Subject: [PATCH 061/161] Docker improvements (#571)

- Copy the current checkout to the Dockerfile.
- Add .dockerignore to exclude files while copying.
- Test tip-of-tree build within CI.
- Run the test suite outside the Docker image.
- Perform extra sanity tests.
- Switch to make commands for CircleCI.
- Improve Docker README.
---
 .circleci/config.yml       | 15 +++++++-----
 .dockerignore              | 25 ++++++++++++++++++++
 docker/Dockerfile          | 20 ++++------------
 docker/Makefile            | 21 +++++++++++------
 docker/README.md           | 47 +++++++++++++++-----------------------
 docker/test_dockerimage.sh | 21 +++++++++++++----
 6 files changed, 86 insertions(+), 63 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 36acaf1304..d0d6af501e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -96,9 +96,13 @@ jobs:
           name: install docker
           command: apt-get update -q && apt-get install -q -y docker.io
       - setup_remote_docker
+      # Build and test the tip-of-tree build of EMSDK
       - run:
           name: build
-          command: docker build --network host ./docker
+          command: make -C ./docker version=tot build
+      - run:
+          name: test
+          command: make -C ./docker version=tot test
 
   publish-docker-image:
     executor: bionic
@@ -110,16 +114,15 @@ jobs:
       - setup_remote_docker
       - run:
           name: build
-          command: docker build --network host --build-arg EMSCRIPTEN_VERSION=${CIRCLE_TAG} --tag emscripten/emsdk:${CIRCLE_TAG} ./docker
+          command: make -C ./docker version=${CIRCLE_TAG} build
       - run:
-          name: tag image
-          command: docker tag emscripten/emsdk:${CIRCLE_TAG} emscripten/emsdk:latest
+          name: test
+          command: make -C ./docker version=${CIRCLE_TAG} test
       - run:
           name: push image
           command: |
             docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
-            docker push emscripten/emsdk:${CIRCLE_TAG}
-            docker push emscripten/emsdk:latest
+            make -C ./docker version=${CIRCLE_TAG} alias=latest push
 
 workflows:
   flake8:
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..0e32b6796e
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,25 @@
+# Ignore all subdirectories
+*/*
+
+# Allow to run the test script inside the Docker container
+!/docker/test_dockerimage.sh
+
+# Allow the Dockerfile for future re-creation/reference
+!/docker/Dockerfile
+
+# Ignore unnecessary files inside top-level directory
+*.bat
+*.csh
+*.fish
+*.ps1
+*.pyc
+.emscripten
+.emscripten.old
+.emscripten_cache
+.emscripten_cache__last_clear
+.emscripten_sanity
+.emscripten_sanity_wasm
+.flake8
+emscripten-releases-tot.txt
+legacy-*-tags.txt
+README.md
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8f3f159d40..e183c21ee9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster AS stage_build
 
-ARG EMSCRIPTEN_VERSION=1.39.20
+ARG EMSCRIPTEN_VERSION=tot
 ENV EMSDK /emsdk
 
 # ------------------------------------------------------------------------------
@@ -18,12 +18,12 @@ RUN echo "## Start building" \
         python3-pip \
     && echo "## Done"
 
-RUN echo "## Get EMSDK" \
-    && git clone https://github.com/emscripten-core/emsdk.git ${EMSDK} \
-    && echo "## Done"
+# Copy the contents of this repository to the container
+COPY . ${EMSDK}
 
 RUN echo "## Install Emscripten" \
     && cd ${EMSDK} \
+    && if [ "$EMSCRIPTEN_VERSION" = "tot" ]; then ./emsdk update-tags; fi \
     && ./emsdk install ${EMSCRIPTEN_VERSION} \
     && echo "## Done"
 
@@ -115,18 +115,6 @@ RUN echo "## Update and install packages" \
     && rm -rf /usr/share/man/??_* \
     && echo "## Done"
 
-# ------------------------------------------------------------------------------
-# Internal test suite of tools that this image provides
-COPY test_dockerimage.sh /emsdk/
-
-RUN echo "## Internal Testing of image" \
-    && /emsdk/test_dockerimage.sh \
-    && echo "## Done"
-
-# ------------------------------------------------------------------------------
-# Copy this Dockerimage into image, so that it will be possible to recreate it later
-COPY Dockerfile /emsdk/dockerfiles/emscripten-core/emsdk/
-
 # ------------------------------------------------------------------------------
 # Use commonly used /src as working directory
 WORKDIR /src
diff --git a/docker/Makefile b/docker/Makefile
index fa02f456fb..0c961ca56b 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,21 +1,28 @@
-#!/usr/bin/env make
+# A Makefile to build, test, tag and publish the Emscripten SDK Docker container.
 
 # Emscripten version to build: Should match the version that has been already released.
-# i.e.:  1.38.45, 1.38.45-upstream
+# i.e.:  1.39.18
 version =
 alias =
 
+image_name ?= emscripten/emsdk
+
 .TEST:
 ifndef version
 	$(error argument 'version' is not set. Please call `make version=SOME_VERSION ...`)
 endif
 
-build: .TEST
-	docker build --network host --build-arg=EMSCRIPTEN_VERSION=${version} --tag emscripten/emsdk:${version} .
+build: Dockerfile .TEST
+	cd .. && docker build --network host --build-arg=EMSCRIPTEN_VERSION=${version} -t ${image_name}:${version} -f docker/$< .
+
+test: test_dockerimage.sh .TEST
+	# test as non-root
+	docker run --rm -u `id -u`:`id -g` -w /emsdk/docker --net=host ${image_name}:${version} \
+		bash $<
 
 push: .TEST
-	docker push emscripten/emsdk:${version}
+	docker push ${image_name}:${version}
 ifdef alias
-	docker tag emscripten/emsdk:${version} emscripten/emsdk:${alias}
-	docker push emscripten/emsdk:${alias}
+	docker tag ${image_name}:${version} ${image_name}:${alias}
+	docker push ${image_name}:${alias}
 endif
diff --git a/docker/README.md b/docker/README.md
index 7199de8dc9..d7c7fc8c42 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,6 +1,6 @@
 # Dockerfile for EMSDK
 
-This Dockerfile builds a self-contained version of emsdk that enables emscripten to be used without any
+This Dockerfile builds a self-contained version of Emscripten SDK that enables Emscripten to be used without any
 other installation on the host system.
 
 It is published at https://hub.docker.com/u/emscripten/emsdk
@@ -23,7 +23,7 @@ EOF
 # compile with docker image
 docker run \
   --rm \
-  -v $(pwd):$(pwd) \
+  -v $(pwd):/src \
   -u $(id -u):$(id -g) \
   emscripten/emsdk \
   emcc helloworld.cpp -o helloworld.js
@@ -51,7 +51,7 @@ This image requires to specify following build arguments:
 
 | arg | description |
 | --- | --- |
-| `EMSCRIPTEN_VERSION` | One of released version of Emscripten. For example `1.38.45`<br/> Can be used with `-upstream` variant like: `1.38.45-upstream`<br /> Minimal supported version is **1.38.40**|
+| `EMSCRIPTEN_VERSION` | One of released version of Emscripten. For example `1.39.17`<br/> Minimal supported version is **1.39.0**|
 
 **Building**
 
@@ -60,13 +60,14 @@ This step will build Dockerfile as given tag on local machine
 # using docker
 docker build \
     --network host \
-    --build-arg=EMSCRIPTEN_VERSION=1.38.43-upstream \
-    --tag emscripten/emsdk:1.38.43-upstream \
+    --build-arg=EMSCRIPTEN_VERSION=1.39.17 \
+    -t emscripten/emsdk:1.39.17 \
+    -f docker/Dockerfile \
     .
 ```
 ```bash
 # using predefined make target
-make version=1.38.43-upstream build
+make version=1.39.17 build test
 ```
 
 **Tagging**
@@ -79,35 +80,24 @@ This step will take local image and push to default docker registry. You need to
 
 ```bash
 # using docker
-docker push emscripten/emsdk:1.38.43-upstream
+docker push emscripten/emsdk:1.39.17
 ```
 ```bash
 # using predefined make target
-make version=1.38.43-upstream push
+make version=1.39.17 push
 ```
 
-In case of pushing the most recent version, this version should be also tagged as `latest` or `latest-upstream` and pushed.
+In case of pushing the most recent version, this version should be also tagged as `latest` and pushed.
 ```bash
 # using docker cli
-
-# in case of fastcomp variant (default backend)
-docker tag emscripten/emsdk:1.38.43 emscripten/emsdk:latest
+docker tag emscripten/emsdk:1.39.17 emscripten/emsdk:latest
 docker push emscripten/emsdk:latest
 
-# in case of upstream variant
-docker tag emscripten/emsdk:1.38.43-upstream emscripten/emsdk:latest-upstream
-docker push emscripten/emsdk:latest-upstream
-
-```
-
 ```bash
-# using predefined make target
-
-make version=1.38.43-upstream alias=latest-upstream push
-
+# using make
+make version=1.39.17 alias=latest push
 ```
 
-
 ### Extending
 
 If your project uses packages that this image doesn't provide you might want to:
@@ -117,20 +107,19 @@ If your project uses packages that this image doesn't provide you might want to:
 1. create own Dockerfile that holds:
     ```dockerfile
     # Point at any base image that you find suitable to extend.
-    FROM emscripten/emsdk:1.38.25
+    FROM emscripten/emsdk:1.39.17
 
     # Install required tools that are useful for your project i.e. ninja-build
     RUN apt update && apt install -y ninja-build
-
     ```
+
 2. build it
-    ```shell
+    ```bash
     docker build -t extended_emscripten .
     ```
 
 3. test
-    ```shell
+    ```bash
     docker run --rm extended_emscripten ninja --version
-    # Python 2.7.16
+    # 1.10.0
     ```
-
diff --git a/docker/test_dockerimage.sh b/docker/test_dockerimage.sh
index 9c8b92bf1e..4f44806c5f 100755
--- a/docker/test_dockerimage.sh
+++ b/docker/test_dockerimage.sh
@@ -1,9 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -ex
 
-sudo -u nobody `which emcc` --version
+if [ $EUID -eq 0 ]; then
+  sudo -u nobody `which emcc` --version
+fi
 
-which asm2wasm
 which llvm-ar
 which emsdk
 node --version
@@ -15,5 +16,15 @@ emcc --version
 java -version
 cmake --version
 
-# cleanup after test
-find ${EMSDK} -name "*.pyc" -exec rm {} \;
+exit_code=0
+
+# test emcc compilation
+echo 'int main() { return 0; }' | emcc -o /tmp/main.js -xc -
+node /tmp/main.js || exit_code=$?
+if [ $exit_code -ne 0 ]; then
+  echo "Node exited with non-zero exit code: $exit_code"
+  exit $exit_code
+fi
+
+# test embuilder
+embuilder build zlib --force

From 2e73421e60949e47cd48bbc57cdda7fb16627f8f Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Wed, 2 Sep 2020 11:14:15 -0700
Subject: [PATCH 062/161] 2.0.2 (#604)

---
 emscripten-releases-tags.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 80278e7e8b..4f0436129a 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.1",
+  "latest": "2.0.2",
   "releases": {
+    "2.0.2":   "ede25d889a0abe63360d4c5d420087c8753b8bbe",
     "2.0.1":   "13e29bd55185e3c12802bc090b4507901856b2ba",
     "2.0.0":   "5974288502aab433d45f53511e961aaca4079d86",
     "1.40.1":  "536568644fd67d53778f6111fdd5f64ad3f4c539",

From 0eb40e10a25570ba34a9ff8116c39c86a97474a2 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <hi@nhooyr.io>
Date: Mon, 7 Sep 2020 10:32:22 -0400
Subject: [PATCH 063/161] Make emsdk_env.sh work under set -o nounset (#605)

Closes emscripten-core/emscripten#6743
---
 emsdk_env.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/emsdk_env.sh b/emsdk_env.sh
index 734125548e..8f76de7522 100644
--- a/emsdk_env.sh
+++ b/emsdk_env.sh
@@ -31,15 +31,15 @@ DIR="."
 # To add a shell, add another conditional below,
 # then add tests to scripts/test_source_env.sh
 
-if [ -n "$BASH_SOURCE" ]; then
+if [ -n "${BASH_SOURCE-}" ]; then
   CURRENT_SCRIPT="$BASH_SOURCE"
-elif [ -n "$ZSH_VERSION" ]; then
+elif [ -n "${ZSH_VERSION-}" ]; then
   CURRENT_SCRIPT="${(%):-%x}"
-elif [ -n "$KSH_VERSION" ]; then
+elif [ -n "${KSH_VERSION-}" ]; then
   CURRENT_SCRIPT=${.sh.file}
 fi
 
-if [ -n "$CURRENT_SCRIPT" ]; then
+if [ -n "${CURRENT_SCRIPT-}" ]; then
   DIR=$(dirname "$CURRENT_SCRIPT")
   if [ -h "$CURRENT_SCRIPT" ]; then
     # Now work out actual DIR since this is part of a symlink.

From 81dd2232e107adb20c3a5a435ebf90506172bf92 Mon Sep 17 00:00:00 2001
From: j-jorge <j-jorge@users.noreply.github.com>
Date: Thu, 10 Sep 2020 15:29:19 +0200
Subject: [PATCH 064/161] Parse the releases info only once in emsdk.py. (#607)

Co-authored-by: Julien Jorge <julien.jorge@stuff-o-matic.com>
---
 emsdk.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 14ce8846b1..d4ff1096e8 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2185,12 +2185,15 @@ def exit_with_error(msg):
 
 # Load the json info for emscripten-releases.
 def load_releases_info():
-  try:
-    text = open(sdk_path('emscripten-releases-tags.txt'), 'r').read()
-    return json.loads(text)
-  except Exception as e:
-    print('Error parsing emscripten-releases-tags.txt!')
-    exit_with_error(str(e))
+  if not hasattr(load_releases_info, 'cached_info'):
+    try:
+      text = open(sdk_path('emscripten-releases-tags.txt'), 'r').read()
+      load_releases_info.cached_info = json.loads(text)
+    except Exception as e:
+      print('Error parsing emscripten-releases-tags.txt!')
+      exit_with_error(str(e))
+
+  return load_releases_info.cached_info
 
 
 # Get a list of tags for emscripten-releases.

From bfdfd61656a80a772ffc2bfed1018e04700e6f27 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 10 Sep 2020 16:14:40 -0700
Subject: [PATCH 065/161] Fix sanity file generation in Dockerfile (#610)

We no longer ship the sanify file as part of the SDK but
expect it be generated on first use:
  https://github.com/WebAssembly/waterfall/pull/656

Also remove the Dockerfile itself from the docker image if
we include it then whenever you change anything in the
Dockerfile it invalides all the layers and forces a
completely rebuild.  This makes iterating on the image
very slow.
---
 .dockerignore     | 3 ---
 docker/Dockerfile | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 0e32b6796e..e7bc7c398c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,9 +4,6 @@
 # Allow to run the test script inside the Docker container
 !/docker/test_dockerimage.sh
 
-# Allow the Dockerfile for future re-creation/reference
-!/docker/Dockerfile
-
 # Ignore unnecessary files inside top-level directory
 *.bat
 *.csh
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e183c21ee9..f58c5cee44 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -28,11 +28,15 @@ RUN echo "## Install Emscripten" \
     && echo "## Done"
 
 # This generates configuration that contains all valid paths according to installed SDK
+# TODO(sbc): We should be able to use just emcc -v here but it doesn't
+# currently create the sanity file.
 RUN cd ${EMSDK} \
     && echo "## Generate standard configuration" \
     && ./emsdk activate ${EMSCRIPTEN_VERSION} \
     && chmod 777 ${EMSDK}/upstream/emscripten \
     && chmod -R 777 ${EMSDK}/upstream/emscripten/cache \
+    && echo "int main() { return 0; }" > hello.c \
+    && ${EMSDK}/upstream/emscripten/emcc -c hello.c \
     && cat ${EMSDK}/upstream/emscripten/cache/sanity.txt \
     && echo "## Done"
 

From e08b17c8bf666ac9e73c0b53832d0f0ec432e92a Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 10 Sep 2020 16:32:23 -0700
Subject: [PATCH 066/161] Remove copy_pregenerated_cache (#609)

Newer SDKs don't require this and removing it doesn't break
any older SDKs (it just slows down their first use).
---
 emsdk.py            | 52 ---------------------------------------------
 emsdk_manifest.json |  6 ++----
 2 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index d4ff1096e8..6570e287de 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2403,56 +2403,6 @@ def run_emcc(tools_to_activate):
         return
 
 
-# Copy over any emscripten cache contents that were pregenerated. This avoids
-# the user needing to immediately build libc etc. on first run.
-# This only applies to legacy SDK versions.  Anything built after
-# https://github.com/WebAssembly/waterfall/pull/644 already has the libraries
-# in the correct location.
-# TODO(sbc): Remove this code.
-def copy_pregenerated_cache(tools_to_activate):
-  tools_with_cache = [t for t in tools_to_activate if hasattr(t, 'pregenerated_cache')]
-  if not tools_with_cache:
-    debug_print('Not copying pregenerated libaries (none found)')
-    return
-
-  em_cache_dir = None
-
-  # First look through all the tools to find the EMSCRIPTEN_ROOT
-  for tool in tools_to_activate:
-    config = tool.activated_config()
-    if 'EMSCRIPTEN_ROOT' in config:
-      em_cache_dir = os.path.join(config['EMSCRIPTEN_ROOT'], 'cache')
-      break
-  else:
-    debug_print('Not copying pregenerated libaries (no EMSCRIPTEN_ROOT found)')
-    return
-
-  # Generating .emscripten will cause emcc to clear the cache on first run (emcc
-  # sees that the file has changed, since we write it here in the emsdk, and it
-  # never saw it before; so it clears the cache as it assumes a new config file
-  # means system libraries may need rebuilding). To avoid emcc's clearing wiping
-  # out the pregenerated cache contents we want to copy in, run emcc here, then
-  # copy the cache contents.
-  run_emcc(tools_to_activate)
-
-  # If we found an EMSCRIPTEN_ROOT look for any tools that include
-  # "pregenerated_cache" and copy those items into the cache.
-  for tool in tools_with_cache:
-    for cache_dir in tool.pregenerated_cache:
-      # Finish the install of an emscripten-releases build.
-      install_path = to_native_path(sdk_path(tool.expand_vars(tool.install_path)))
-      in_cache = os.path.join(install_path, 'lib', cache_dir)
-      if not os.path.exists(in_cache):
-        continue
-      out_cache = os.path.join(em_cache_dir, cache_dir)
-      if not os.path.exists(out_cache):
-        os.makedirs(out_cache)
-      for filename in os.listdir(in_cache):
-        debug_print('Copying %s to cache: %s' % (filename, out_cache))
-        shutil.copy2(os.path.join(in_cache, filename),
-                     os.path.join(out_cache, filename))
-
-
 def write_set_env_script(env_string):
   assert(WINDOWS)
   open(EMSDK_SET_ENV, 'w').write(env_string)
@@ -2471,8 +2421,6 @@ def set_active_tools(tools_to_activate, permanently_activate):
 
   generate_dot_emscripten(tools_to_activate)
 
-  copy_pregenerated_cache(tools_to_activate)
-
   # Construct a .bat script that will be invoked to set env. vars and PATH
   # We only do this on windows since emsdk.bat is able to modify the
   # calling shell environment.  On other platform `source emsdk_env.sh` is
diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 0c9150e033..51bd33d447 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -100,8 +100,7 @@
     "install_path": "upstream",
     "activated_path": "%installation_dir%/emscripten",
     "activated_cfg": "LLVM_ROOT='%installation_dir%/bin';BINARYEN_ROOT='%installation_dir%';EMSCRIPTEN_ROOT='%installation_dir%/emscripten'",
-    "emscripten_releases_hash": "%releases-tag%",
-    "pregenerated_cache": ["asmjs", "wasm", "wasm-obj", "wasm-bc"]
+    "emscripten_releases_hash": "%releases-tag%"
   },
   {
     "id": "releases",
@@ -115,8 +114,7 @@
     "install_path": "fastcomp",
     "activated_path": "%installation_dir%/emscripten",
     "activated_cfg": "LLVM_ROOT='%installation_dir%/fastcomp/bin';BINARYEN_ROOT='%installation_dir%';EMSCRIPTEN_ROOT='%installation_dir%/emscripten';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%/bin/optimizer%.exe%'",
-    "emscripten_releases_hash": "%releases-tag%",
-    "pregenerated_cache": ["asmjs", "wasm", "wasm-obj", "wasm-bc"]
+    "emscripten_releases_hash": "%releases-tag%"
   },
 
   {

From def6e4903ab0c5592aeab018716b367f61123677 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Thu, 10 Sep 2020 18:28:21 -0700
Subject: [PATCH 067/161] 2.0.3 (#612)

---
 emscripten-releases-tags.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 4f0436129a..c5b79468a6 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.2",
+  "latest": "2.0.3",
   "releases": {
+    "2.0.3":   "7a7f38ca19da152d4cd6da4776921a0f1e3f3e3f",
     "2.0.2":   "ede25d889a0abe63360d4c5d420087c8753b8bbe",
     "2.0.1":   "13e29bd55185e3c12802bc090b4507901856b2ba",
     "2.0.0":   "5974288502aab433d45f53511e961aaca4079d86",

From 5f630def2a9211040ba736315c4dde71e20f2b40 Mon Sep 17 00:00:00 2001
From: walkingeyerobot <mitch@thefoley.net>
Date: Thu, 10 Sep 2020 21:42:46 -0400
Subject: [PATCH 068/161] add a wasm bazel toolchain (#603)

---
 .circleci/config.yml                          |   23 +
 bazel/README.md                               |   63 +
 bazel/WORKSPACE                               |   25 +
 bazel/bazelrc                                 |    5 +
 bazel/emscripten_toolchain/BUILD.bazel        |   80 ++
 bazel/emscripten_toolchain/crosstool.bzl      | 1126 +++++++++++++++++
 bazel/emscripten_toolchain/emar.sh            |    5 +
 bazel/emscripten_toolchain/emcc.sh            |    5 +
 bazel/emscripten_toolchain/emcc_link.sh       |    5 +
 bazel/emscripten_toolchain/emscripten.BUILD   |    6 +
 bazel/emscripten_toolchain/emscripten_config  |    9 +
 bazel/emscripten_toolchain/env.sh             |    7 +
 bazel/emscripten_toolchain/link_wrapper.py    |  146 +++
 bazel/emscripten_toolchain/wasm_binary.py     |   84 ++
 bazel/emscripten_toolchain/wasm_cc_binary.bzl |  150 +++
 bazel/emscripten_toolchain/wasm_rules.bzl     |    6 +
 bazel/hello-world/BUILD                       |   12 +
 bazel/hello-world/hello-world.cc              |    6 +
 scripts/test_bazel.sh                         |    9 +
 scripts/update_bazel_workspace.sh             |   63 +
 20 files changed, 1835 insertions(+)
 create mode 100644 bazel/README.md
 create mode 100644 bazel/WORKSPACE
 create mode 100644 bazel/bazelrc
 create mode 100644 bazel/emscripten_toolchain/BUILD.bazel
 create mode 100644 bazel/emscripten_toolchain/crosstool.bzl
 create mode 100755 bazel/emscripten_toolchain/emar.sh
 create mode 100755 bazel/emscripten_toolchain/emcc.sh
 create mode 100755 bazel/emscripten_toolchain/emcc_link.sh
 create mode 100644 bazel/emscripten_toolchain/emscripten.BUILD
 create mode 100644 bazel/emscripten_toolchain/emscripten_config
 create mode 100755 bazel/emscripten_toolchain/env.sh
 create mode 100644 bazel/emscripten_toolchain/link_wrapper.py
 create mode 100644 bazel/emscripten_toolchain/wasm_binary.py
 create mode 100644 bazel/emscripten_toolchain/wasm_cc_binary.bzl
 create mode 100644 bazel/emscripten_toolchain/wasm_rules.bzl
 create mode 100644 bazel/hello-world/BUILD
 create mode 100644 bazel/hello-world/hello-world.cc
 create mode 100755 scripts/test_bazel.sh
 create mode 100755 scripts/update_bazel_workspace.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d0d6af501e..8b3959661e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -124,6 +124,26 @@ jobs:
             docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
             make -C ./docker version=${CIRCLE_TAG} alias=latest push
 
+  test-bazel:
+    executor: bionic
+    steps:
+      - checkout
+      - run: apt-get install -q -y curl gnupg
+      - run: curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor > bazel.gpg
+      - run: mv bazel.gpg /etc/apt/trusted.gpg.d/
+      - run: echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
+      - run:
+          name: install pip
+          command: |
+            apt-get update -q
+            apt-get install -q -y python3-pip
+      - run: pip3 install absl-py
+      - run:
+          name: install bazel
+          command: |
+            apt-get install -q -y bazel
+      - run: scripts/test_bazel.sh
+
 workflows:
   flake8:
     jobs:
@@ -146,3 +166,6 @@ workflows:
               ignore: /.*/
             tags:
               only: /.*/
+  test-bazel:
+    jobs:
+      - test-bazel
diff --git a/bazel/README.md b/bazel/README.md
new file mode 100644
index 0000000000..17e9264f66
--- /dev/null
+++ b/bazel/README.md
@@ -0,0 +1,63 @@
+# Bazel Emscripten toolchain
+
+## Setup Instructions
+
+1. Merge the `WORKSPACE` file in with your own at the root of your bazel
+directory structure. If you don't have one, simply copy the file.
+2. Merge the `bazelrc` file in with your `.bazelrc` file at the root of your
+bazel directory structure. If you don't have one, simply copy the file and
+rename it to `.bazelrc`. (Note the `.`)
+3. Copy the `emscripten_toolchain` folder along with its contents to the root of
+your bazel directory.
+
+Your directory structure should look like this:
+```
+bazel_root/
+├── .bazelrc
+├── WORKSPACE
+├── emscripten_toolchain/
+│   ├── BUILD.bazel
+│   ├── builddefs.bzl
+│   ├── crosstool.bzl
+│   ├── emar.sh
+│   ├── emcc.sh
+│   ├── emcc_link.sh
+│   ├── emscripten.BUILD
+│   ├── emscripten_config
+│   ├── env.sh
+│   ├── link_wrapper.py
+│   ├── wasm_binary.py
+│   ├── wasm_cc_binary.bzl
+│   ├── wasm_rules.bzl
+├── your_project_folder/
+│   ├── your_project.file
+```
+
+## Building
+
+### Using --config=wasm
+Simply pass `--config=wasm` when building a normal `cc_binary`. The result of
+this build will be a tar archive containing any files produced by emscripten.
+
+### Using wasm_cc_binary
+First, write a new rule wrapping your `cc_binary`.
+
+```
+load("@rules_cc//cc:defs.bzl", "cc_binary")
+load("//emscripten_toolchain:wasm_rules.bzl", "wasm_cc_binary")
+
+cc_binary(
+    name = "hello-world",
+    srcs = ["hello-world.cc"],
+)
+
+wasm_cc_binary(
+    name = "hello-world-wasm",
+    cc_target = ":hello-world",
+)
+```
+
+Now you can run `bazel build :hello-world-wasm`. The result of this build will
+be the individual files produced by emscripten. Note that some of these files
+may be empty. This is because bazel has no concept of optional outputs for
+rules.
diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
new file mode 100644
index 0000000000..971c714dd2
--- /dev/null
+++ b/bazel/WORKSPACE
@@ -0,0 +1,25 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "build_bazel_rules_nodejs",
+    sha256 = "0f2de53628e848c1691e5729b515022f5a77369c76a09fbe55611e12731c90e3",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.0.1/rules_nodejs-2.0.1.tar.gz"],
+)
+
+load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
+
+# emscripten 2.0.2
+http_archive(
+    name = "emscripten",
+    sha256 = "9febbc252372efee82e62d548f510dfc85ade6661f5f3be28823848d4757d614",
+    strip_prefix = "install",
+    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/ede25d889a0abe63360d4c5d420087c8753b8bbe/wasm-binaries.tbz2",
+    build_file = "//emscripten_toolchain:emscripten.BUILD",
+    type = "tar.bz2",
+)
+
+npm_install(
+    name = "npm",
+    package_json = "@emscripten//:emscripten/package.json",
+    package_lock_json = "@emscripten//:emscripten/package-lock.json",
+)
diff --git a/bazel/bazelrc b/bazel/bazelrc
new file mode 100644
index 0000000000..85801e8381
--- /dev/null
+++ b/bazel/bazelrc
@@ -0,0 +1,5 @@
+build:wasm --crosstool_top=//emscripten_toolchain:everything
+
+build:wasm --cpu=wasm
+
+build:wasm --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
diff --git a/bazel/emscripten_toolchain/BUILD.bazel b/bazel/emscripten_toolchain/BUILD.bazel
new file mode 100644
index 0000000000..89fc320c71
--- /dev/null
+++ b/bazel/emscripten_toolchain/BUILD.bazel
@@ -0,0 +1,80 @@
+load(":crosstool.bzl", "emscripten_cc_toolchain_config_rule")
+
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+    name = "common-script-includes",
+    srcs = [
+        "emar.sh",
+        "emcc.sh",
+        "emscripten_config",
+        "env.sh",
+        "@emscripten//:all",
+        "@nodejs//:node_files",
+        "@npm//:node_modules",
+    ],
+)
+
+filegroup(
+    name = "compile-emscripten",
+    srcs = [":common-script-includes"],
+)
+
+filegroup(
+    name = "link-emscripten",
+    srcs = [
+        "emcc_link.sh",
+        "link_wrapper.py",
+        ":common-script-includes",
+        "@emscripten//:all",
+        "@nodejs//:node_files",
+    ],
+)
+
+filegroup(
+    name = "every-file",
+    srcs = [
+        ":compile-emscripten",
+        ":link-emscripten",
+        "@emscripten//:all",
+        "@nodejs//:node_files",
+    ],
+)
+
+filegroup(name = "empty")
+
+# dlmalloc.bc is implictly added by the emscripten toolchain
+cc_library(name = "malloc")
+
+emscripten_cc_toolchain_config_rule(
+    name = "wasm",
+    cpu = "wasm",
+    emscripten_version = "emscripten",
+)
+
+cc_toolchain(
+    name = "cc-compiler-wasm",
+    all_files = ":every-file",
+    ar_files = ":common-script-includes",
+    as_files = ":empty",
+    compiler_files = ":compile-emscripten",
+    dwp_files = ":empty",
+    linker_files = ":link-emscripten",
+    objcopy_files = ":empty",
+    strip_files = ":empty",
+    toolchain_config = "wasm",
+    toolchain_identifier = "emscripten-wasm",
+)
+
+cc_toolchain_suite(
+    name = "everything",
+    toolchains = {
+        "wasm": ":cc-compiler-wasm",
+        "wasm|emscripten": ":cc-compiler-wasm",
+    },
+)
+
+py_binary(
+    name = "wasm_binary",
+    srcs = ["wasm_binary.py"],
+)
diff --git a/bazel/emscripten_toolchain/crosstool.bzl b/bazel/emscripten_toolchain/crosstool.bzl
new file mode 100644
index 0000000000..31b516ed52
--- /dev/null
+++ b/bazel/emscripten_toolchain/crosstool.bzl
@@ -0,0 +1,1126 @@
+"""This module encapsulates logic to create emscripten_cc_toolchain_config rule."""
+
+load(
+    "@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl",
+    "action_config",
+    "env_entry",
+    "env_set",
+    "feature",
+    "feature_set",
+    "flag_group",
+    "tool",
+    "tool_path",
+    "variable_with_value",
+    "with_feature_set",
+    _flag_set = "flag_set",
+)
+load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
+
+def flag_set(flags = None, features = None, not_features = None, **kwargs):
+    """Extension to flag_set which allows for a "simple" form.
+
+    The simple form allows specifying flags as a simple list instead of a flag_group
+    if enable_if or expand_if semantics are not required.
+
+    Similarly, the simple form allows passing features/not_features if they are a simple
+    list of semantically "and" features.
+    (i.e. "asan" and "dbg", rather than "asan" or "dbg")
+
+    Args:
+      flags: list, set of flags
+      features: list, set of features required to be enabled.
+      not_features: list, set of features required to not be enabled.
+      **kwargs: The rest of the args for flag_set.
+
+    Returns:
+      flag_set
+    """
+    if flags:
+        if kwargs.get("flag_groups"):
+            fail("Cannot set flags and flag_groups")
+        else:
+            kwargs["flag_groups"] = [flag_group(flags = flags)]
+
+    if features or not_features:
+        if kwargs.get("with_features"):
+            fail("Cannot set features/not_feature and with_features")
+        kwargs["with_features"] = [with_feature_set(
+            features = features or [],
+            not_features = not_features or [],
+        )]
+    return _flag_set(**kwargs)
+
+CROSSTOOL_DEFAULT_WARNINGS = [
+    "-Wall",
+]
+
+def _impl(ctx):
+    target_cpu = ctx.attr.cpu
+    toolchain_identifier = "emscripten-" + target_cpu
+    target_system_name = target_cpu + "-unknown-emscripten"
+
+    host_system_name = "i686-unknown-linux-gnu"
+
+    target_libc = "musl/js"
+
+    abi_version = "emscripten_syscalls"
+
+    compiler = "emscripten"
+    abi_libc_version = "default"
+
+    cc_target_os = "emscripten"
+    emscripten_version = ctx.attr.emscripten_version
+    emscripten_root = "external/emscripten/" + emscripten_version
+
+    builtin_sysroot = None
+
+    ################################################################
+    # Tools
+    ################################################################
+    clang_tool = tool(path = "emcc.sh")
+    clif_match_tool = tool(path = "dummy_clif_matcher")
+    link_tool = tool(path = "emcc_link.sh")
+    archive_tool = tool(path = "emar.sh")
+    strip_tool = tool(path = "NOT_USED_STRIP_TOOL")
+
+    #### Legacy tool paths (much of this is redundant with action_configs, but
+    #### these are still used for some things)
+    tool_paths = [
+        tool_path(name = "ar", path = "emar.sh"),
+        tool_path(name = "cpp", path = "/bin/false"),
+        tool_path(name = "gcc", path = "emcc.sh"),
+        tool_path(name = "gcov", path = "/bin/false"),
+        tool_path(name = "ld", path = "emcc_link.sh"),
+        tool_path(name = "nm", path = "NOT_USED"),
+        tool_path(name = "objdump", path = "/bin/false"),
+        tool_path(name = "strip", path = "NOT_USED"),
+    ]
+
+    ################################################################
+    # Action Configs
+    ################################################################
+
+    cpp_compile_action = action_config(
+        action_name = ACTION_NAMES.cpp_compile,
+        tools = [clang_tool],
+    )
+
+    cpp_module_compile_action = action_config(
+        action_name = ACTION_NAMES.cpp_module_compile,
+        tools = [clang_tool],
+    )
+
+    cpp_module_codegen_action = action_config(
+        action_name = ACTION_NAMES.cpp_module_codegen,
+        tools = [clang_tool],
+    )
+
+    clif_match_action = action_config(
+        action_name = ACTION_NAMES.clif_match,
+        tools = [clif_match_tool],
+    )
+
+    cpp_link_dynamic_library_action = action_config(
+        action_name = ACTION_NAMES.cpp_link_dynamic_library,
+        tools = [link_tool],
+    )
+
+    strip_action = action_config(
+        action_name = ACTION_NAMES.strip,
+        tools = [strip_tool],
+    )
+
+    preprocess_assemble_action = action_config(
+        action_name = ACTION_NAMES.preprocess_assemble,
+        tools = [clang_tool],
+    )
+
+    cpp_header_parsing_action = action_config(
+        action_name = ACTION_NAMES.cpp_header_parsing,
+        tools = [clang_tool],
+    )
+
+    cpp_link_static_library_action = action_config(
+        action_name = ACTION_NAMES.cpp_link_static_library,
+        enabled = True,
+        flag_sets = [
+            flag_set(
+                flag_groups = [
+                    flag_group(
+                        flags = ["rcsD", "%{output_execpath}"],
+                        expand_if_available = "output_execpath",
+                    ),
+                ],
+            ),
+            flag_set(
+                flag_groups = [
+                    flag_group(
+                        iterate_over = "libraries_to_link",
+                        flag_groups = [
+                            flag_group(
+                                flags = ["%{libraries_to_link.name}"],
+                                expand_if_equal = variable_with_value(
+                                    name = "libraries_to_link.type",
+                                    value = "object_file",
+                                ),
+                            ),
+                            flag_group(
+                                flags = ["%{libraries_to_link.object_files}"],
+                                iterate_over = "libraries_to_link.object_files",
+                                expand_if_equal = variable_with_value(
+                                    name = "libraries_to_link.type",
+                                    value = "object_file_group",
+                                ),
+                            ),
+                        ],
+                        expand_if_available = "libraries_to_link",
+                    ),
+                ],
+            ),
+            flag_set(
+                flag_groups = [
+                    flag_group(
+                        flags = ["@%{linker_param_file}"],
+                        expand_if_available = "linker_param_file",
+                    ),
+                ],
+            ),
+        ],
+        tools = [archive_tool],
+    )
+
+    c_compile_action = action_config(
+        action_name = ACTION_NAMES.c_compile,
+        tools = [clang_tool],
+    )
+
+    linkstamp_compile_action = action_config(
+        action_name = ACTION_NAMES.linkstamp_compile,
+        tools = [clang_tool],
+    )
+
+    assemble_action = action_config(
+        action_name = ACTION_NAMES.assemble,
+        tools = [clang_tool],
+    )
+
+    cpp_link_executable_action = action_config(
+        action_name = ACTION_NAMES.cpp_link_executable,
+        tools = [link_tool],
+    )
+
+    cpp_link_nodeps_dynamic_library_action = action_config(
+        action_name = ACTION_NAMES.cpp_link_nodeps_dynamic_library,
+        tools = [link_tool],
+    )
+
+    action_configs = [
+        strip_action,
+        c_compile_action,
+        cpp_compile_action,
+        linkstamp_compile_action,
+        assemble_action,
+        preprocess_assemble_action,
+        cpp_header_parsing_action,
+        cpp_module_compile_action,
+        cpp_module_codegen_action,
+        cpp_link_executable_action,
+        cpp_link_dynamic_library_action,
+        cpp_link_nodeps_dynamic_library_action,
+        cpp_link_static_library_action,
+        clif_match_action,
+    ]
+
+    all_compile_actions = [
+        ACTION_NAMES.c_compile,
+        ACTION_NAMES.cpp_compile,
+        ACTION_NAMES.linkstamp_compile,
+        ACTION_NAMES.assemble,
+        ACTION_NAMES.preprocess_assemble,
+        ACTION_NAMES.cpp_header_parsing,
+        ACTION_NAMES.cpp_module_compile,
+        ACTION_NAMES.cpp_module_codegen,
+        ACTION_NAMES.clif_match,
+        ACTION_NAMES.lto_backend,
+    ]
+
+    all_cpp_compile_actions = [
+        ACTION_NAMES.cpp_compile,
+        ACTION_NAMES.linkstamp_compile,
+        ACTION_NAMES.cpp_header_parsing,
+        ACTION_NAMES.cpp_module_compile,
+        ACTION_NAMES.cpp_module_codegen,
+        ACTION_NAMES.clif_match,
+    ]
+
+    preprocessor_compile_actions = [
+        ACTION_NAMES.c_compile,
+        ACTION_NAMES.cpp_compile,
+        ACTION_NAMES.linkstamp_compile,
+        ACTION_NAMES.preprocess_assemble,
+        ACTION_NAMES.cpp_header_parsing,
+        ACTION_NAMES.cpp_module_compile,
+        ACTION_NAMES.clif_match,
+    ]
+
+    all_link_actions = [
+        ACTION_NAMES.cpp_link_executable,
+        ACTION_NAMES.cpp_link_dynamic_library,
+        ACTION_NAMES.cpp_link_nodeps_dynamic_library,
+    ]
+
+    ################################################################
+    # Features
+    ################################################################
+
+    features = [
+        # This set of magic "feature"s are important configuration information for blaze.
+        feature(name = "no_legacy_features", enabled = True),
+        feature(
+            name = "has_configured_linker_path",
+            enabled = True,
+        ),
+
+        # Blaze requests this feature by default, but we don't care.
+        feature(name = "dependency_file"),
+
+        # Blaze requests this feature by default, but we don't care.
+        feature(name = "random_seed"),
+
+        # Formerly "needsPic" attribute
+        feature(name = "supports_pic", enabled = False),
+
+        # Blaze requests this feature by default.
+        # Blaze also tests if this feature is supported, before setting the "pic" build-variable.
+        feature(name = "pic"),
+
+        # Blaze requests this feature if fission is requested
+        # Blaze also tests if it's supported to see if we support fission.
+        feature(name = "per_object_debug_info"),
+
+        # Blaze requests this feature by default.
+        # Blaze also tests if this feature is supported before setting preprocessor_defines
+        # (...but why?)
+        feature(name = "preprocessor_defines"),
+
+        # Blaze requests this feature by default.
+        # Blaze also tests if this feature is supported before setting includes. (...but why?)
+        feature(name = "include_paths"),
+
+        # Blaze tests if this feature is enabled in order to create implicit
+        # "nodeps" .so outputs from cc_library rules.
+        feature(name = "supports_dynamic_linker", enabled = False),
+
+        # Blaze requests this feature when linking a cc_binary which is
+        # "dynamic" aka linked against nodeps-dynamic-library cc_library
+        # outputs.
+        feature(name = "dynamic_linking_mode"),
+
+        #### Configuration features
+        feature(
+            name = "crosstool_cpu",
+            enabled = True,
+            implies = ["crosstool_cpu_" + target_cpu],
+        ),
+        feature(
+            name = "crosstool_cpu_asmjs",
+            provides = ["variant:crosstool_cpu"],
+        ),
+        feature(
+            name = "crosstool_cpu_wasm",
+            provides = ["variant:crosstool_cpu"],
+        ),
+
+        # These 3 features will be automatically enabled by blaze in the
+        # corresponding build mode.
+        feature(
+            name = "opt",
+            provides = ["variant:crosstool_build_mode"],
+        ),
+        feature(
+            name = "dbg",
+            provides = ["variant:crosstool_build_mode"],
+        ),
+        feature(
+            name = "fastbuild",
+            provides = ["variant:crosstool_build_mode"],
+        ),
+
+        #### User-settable features
+
+        # Set if enabling exceptions.
+        feature(name = "exceptions"),
+
+        # This feature overrides the default optimization to prefer execution speed
+        # over binary size (like clang -O3).
+        feature(
+            name = "optimized_for_speed",
+            provides = ["variant:crosstool_optimization_mode"],
+        ),
+
+        # This feature overrides the default optimization to prefer binary size over
+        # execution speed (like clang -Oz).
+        feature(
+            name = "optimized_for_size",
+            provides = ["variant:crosstool_optimization_mode"],
+        ),
+
+        # Convenience aliases / alt-spellings.
+        feature(
+            name = "optimize_for_speed",
+            implies = ["optimized_for_speed"],
+        ),
+        feature(
+            name = "optimize_for_size",
+            implies = ["optimized_for_size"],
+        ),
+
+        # This feature allows easier use of profiling tools by preserving mangled
+        # C++ names. This does everything profiling_funcs does and more.
+        feature(name = "profiling"),
+
+        # This feature emits only enough debug info for function names to appear
+        # in profiles.
+        feature(name = "profiling_funcs"),
+
+        # This feature allows source maps to be generated.
+        feature(
+            name = "source_maps",
+            implies = ["full_debug_info"],
+        ),
+        feature(
+            name = "dwarf_debug_info",
+            implies = ["profiling"],
+        ),
+
+        # Turns on full debug info (-g4).
+        feature(name = "full_debug_info"),
+
+        # Enables the use of "Emscripten" Pthread implementation.
+        # https://kripken.github.io/emscripten-site/docs/porting/pthreads.html
+        # https://github.com/kripken/emscripten/wiki/Pthreads-with-WebAssembly
+        feature(name = "use_pthreads"),
+
+        # If enabled, the runtime will exit when main() completes.
+        feature(name = "exit_runtime"),
+
+        # Primarily for toolchain maintainers:
+        feature(name = "emcc_debug"),
+        feature(name = "emcc_debug_link"),
+        feature(
+            name = "llvm_backend",
+            requires = [feature_set(features = ["crosstool_cpu_wasm"])],
+            enabled = True,
+        ),
+
+        # Remove once flag is flipped.
+        # See https://github.com/bazelbuild/bazel/issues/7687
+        feature(
+            name = "do_not_split_linking_cmdline",
+        ),
+
+        # Adds simd support, only available with the llvm backend.
+        feature(
+            name = "wasm_simd",
+            requires = [feature_set(features = ["llvm_backend"])],
+        ),
+        feature(
+            name = "precise_long_double_printf",
+            enabled = True,
+        ),
+        feature(
+            name = "wasm_warnings_as_errors",
+            enabled = True,
+        ),
+
+        # ASan and UBSan. See also:
+        # https://emscripten.org/docs/debugging/Sanitizers.html
+        feature(name = "wasm_asan"),
+        feature(name = "wasm_ubsan"),
+    ]
+
+    crosstool_default_flag_sets = [
+        # Compile, Link, and CC_FLAGS make variable
+        flag_set(
+            actions = [
+                ACTION_NAMES.c_compile,
+                ACTION_NAMES.cpp_compile,
+                ACTION_NAMES.linkstamp_compile,
+                ACTION_NAMES.assemble,
+                ACTION_NAMES.preprocess_assemble,
+                ACTION_NAMES.cpp_header_parsing,
+                ACTION_NAMES.cpp_module_compile,
+                ACTION_NAMES.cpp_module_codegen,
+                ACTION_NAMES.clif_match,
+                ACTION_NAMES.cpp_link_executable,
+                ACTION_NAMES.cpp_link_dynamic_library,
+                ACTION_NAMES.cpp_link_nodeps_dynamic_library,
+            ],
+            flag_groups = [
+                flag_group(
+                    flags = ["--sysroot=%{sysroot}"],
+                    expand_if_available = "sysroot",
+                ),
+            ],
+        ),
+        # Compile + Link
+        flag_set(
+            actions = [
+                ACTION_NAMES.c_compile,
+                ACTION_NAMES.cpp_compile,
+                ACTION_NAMES.linkstamp_compile,
+                ACTION_NAMES.assemble,
+                ACTION_NAMES.preprocess_assemble,
+                ACTION_NAMES.cpp_header_parsing,
+                ACTION_NAMES.cpp_module_compile,
+                ACTION_NAMES.cpp_module_codegen,
+                ACTION_NAMES.clif_match,
+                ACTION_NAMES.cpp_link_executable,
+                ACTION_NAMES.cpp_link_dynamic_library,
+                ACTION_NAMES.cpp_link_nodeps_dynamic_library,
+            ],
+            # This forces color diagnostics even on Forge (where we don't have an
+            # attached terminal).
+            flags = [
+                "-fdiagnostics-color",
+            ],
+        ),
+        # C++ compiles (and implicitly link)
+        flag_set(
+            actions = all_cpp_compile_actions,
+            flags = [
+                "-fno-exceptions",
+            ],
+            not_features = ["exceptions"],
+        ),
+        flag_set(
+            actions = all_cpp_compile_actions,
+            flags = [
+                "-fexceptions",
+            ],
+            features = ["exceptions"],
+        ),
+        # All compiles (and implicitly link)
+        flag_set(
+            actions = all_compile_actions +
+                      all_link_actions,
+            flags = [
+                "-fno-strict-aliasing",
+                "-funsigned-char",
+                "-no-canonical-prefixes",
+            ],
+        ),
+        # Language Features
+        flag_set(
+            actions = all_cpp_compile_actions,
+            flags = [
+                "-std=gnu++17",
+                "-nostdinc",
+                "-Xclang",
+                "-nobuiltininc",
+                "-Xclang",
+                "-nostdsysteminc",
+            ],
+        ),
+
+        # Emscripten-specific settings:
+        flag_set(
+            actions = all_compile_actions + all_link_actions,
+            flags = ["-s", "WASM=0"],
+            features = ["crosstool_cpu_asmjs"],
+        ),
+        flag_set(
+            actions = all_compile_actions +
+                      all_link_actions,
+            flags = ["-s", "USE_PTHREADS=1"],
+            features = ["use_pthreads"],
+        ),
+        flag_set(
+            actions = all_link_actions,
+            flags = ["-s", "EXIT_RUNTIME=1"],
+            features = ["exit_runtime"],
+        ),
+        flag_set(
+            actions = all_compile_actions + all_link_actions,
+            flags = ["-pthread"],
+            features = ["llvm_backend", "use_pthreads"],
+        ),
+        flag_set(
+            actions = all_compile_actions + all_link_actions,
+            flags = ["-msimd128"],
+            features = ["wasm_simd"],
+        ),
+        flag_set(
+            actions = all_link_actions,
+            flags = ["-s", "PRINTF_LONG_DOUBLE=1"],
+            features = ["precise_long_double_printf"],
+        ),
+
+        # Opt
+        flag_set(
+            actions = preprocessor_compile_actions,
+            flags = ["-DNDEBUG"],
+            features = ["opt"],
+        ),
+        flag_set(
+            actions = all_compile_actions,
+            flags = ["-fomit-frame-pointer"],
+            features = ["opt"],
+        ),
+        flag_set(
+            actions = all_compile_actions +
+                      all_link_actions,
+            flags = ["-O3"],
+            features = ["opt"],
+        ),
+        # Users can override opt-level with semantic names...
+        flag_set(
+            actions = all_compile_actions +
+                      all_link_actions,
+            flags = ["-Oz"],
+            features = ["optimized_for_size", "opt"],
+        ),
+        flag_set(
+            actions = all_compile_actions +
+                      all_link_actions,
+            flags = ["-O3"],
+            features = ["optimized_for_speed", "opt"],
+        ),
+
+        # Fastbuild
+        flag_set(
+            actions = all_compile_actions,
+            flags = ["-fomit-frame-pointer"],
+            features = ["fastbuild"],
+        ),
+        flag_set(
+            actions = all_compile_actions +
+                      all_link_actions,
+            flags = ["-O2"],
+            features = ["fastbuild"],
+        ),
+
+        # Dbg
+        flag_set(
+            actions = all_compile_actions,
+            flags = ["-fno-omit-frame-pointer"],
+            features = ["dbg"],
+        ),
+        flag_set(
+            actions = all_compile_actions +
+                      all_link_actions,
+            flags = ["-g", "-O0"],
+            features = ["dbg"],
+        ),
+        flag_set(
+            actions = all_compile_actions +
+                      all_link_actions,
+            flags = [
+                "-g4",
+                "-fsanitize=address",
+                "-O1",
+                "-DADDRESS_SANITIZER=1",
+                "-fno-omit-frame-pointer",
+            ],
+            features = ["wasm_asan"],
+        ),
+        flag_set(
+            actions = all_compile_actions +
+                      all_link_actions,
+            flags = [
+                "-g4",
+                "-fsanitize=undefined",
+                "-O1",
+                "-DUNDEFINED_BEHAVIOR_SANITIZER=1",
+                "-fno-omit-frame-pointer",
+                "-fno-sanitize=vptr",
+            ],
+            features = ["wasm_ubsan"],
+        ),
+
+        # Profiling provides full debug info and a special --profiling flag
+        # to control name mangling
+        flag_set(
+            actions = all_link_actions,
+            flags = ["--profiling"],
+            features = ["profiling"],
+        ),
+        flag_set(
+            actions = all_link_actions,
+            flags = ["--profiling_funcs"],
+            features = ["profiling_funcs"],
+        ),
+        flag_set(
+            actions = all_compile_actions +
+                      all_link_actions,
+            flags = ["-g4"],
+            features = ["full_debug_info"],
+        ),
+        flag_set(
+            actions = all_link_actions,
+            flags = ["-gseparate-dwarf"],
+            features = ["dwarf_debug_info"],
+        ),
+        flag_set(
+            actions = all_compile_actions +
+                      all_link_actions,
+            flags = ["-fdebug-compilation-dir=."],
+            features = ["dwarf_debug_info"],
+        ),
+        # Generic warning flag list
+        flag_set(
+            actions = all_compile_actions,
+            flags = CROSSTOOL_DEFAULT_WARNINGS,
+        ),
+
+        # Defines and Includes and Paths and such
+        flag_set(
+            actions = all_compile_actions,
+            flag_groups = [
+                flag_group(flags = ["-fPIC"], expand_if_available = "pic"),
+            ],
+        ),
+        flag_set(
+            actions = preprocessor_compile_actions,
+            flag_groups = [
+                flag_group(
+                    flags = ["-D%{preprocessor_defines}"],
+                    iterate_over = "preprocessor_defines",
+                ),
+            ],
+        ),
+        flag_set(
+            actions = preprocessor_compile_actions,
+            flag_groups = [
+                flag_group(
+                    flags = ["-include", "%{includes}"],
+                    iterate_over = "includes",
+                    expand_if_available = "includes",
+                ),
+            ],
+        ),
+        flag_set(
+            actions = preprocessor_compile_actions,
+            flag_groups = [
+                flag_group(
+                    flags = ["-iquote", "%{quote_include_paths}"],
+                    iterate_over = "quote_include_paths",
+                ),
+                flag_group(
+                    flags = ["-I%{include_paths}"],
+                    iterate_over = "include_paths",
+                ),
+                flag_group(
+                    flags = ["-isystem", "%{system_include_paths}"],
+                    iterate_over = "system_include_paths",
+                ),
+            ],
+        ),
+
+        ## Linking options (not libs -- those go last)
+
+        # Generic link options
+        flag_set(
+            actions = [
+                ACTION_NAMES.cpp_link_dynamic_library,
+                ACTION_NAMES.cpp_link_nodeps_dynamic_library,
+            ],
+            flags = ["-shared"],
+        ),
+
+        # Linker search paths and objects:
+        flag_set(
+            actions = all_link_actions,
+            flag_groups = [
+                flag_group(
+                    iterate_over = "runtime_library_search_directories",
+                    flag_groups = [
+                        flag_group(
+                            flags = [
+                                "-Wl,-rpath,$EXEC_ORIGIN/%{runtime_library_search_directories}",
+                            ],
+                            expand_if_true = "is_cc_test",
+                        ),
+                        flag_group(
+                            flags = [
+                                "-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}",
+                            ],
+                            expand_if_false = "is_cc_test",
+                        ),
+                    ],
+                    expand_if_available = "runtime_library_search_directories",
+                ),
+            ],
+        ),
+        flag_set(
+            actions = all_link_actions,
+            flag_groups = [
+                flag_group(
+                    flags = ["-L%{library_search_directories}"],
+                    iterate_over = "library_search_directories",
+                    expand_if_available = "library_search_directories",
+                ),
+            ],
+        ),
+        flag_set(
+            actions = all_link_actions,
+            flag_groups = [
+                flag_group(
+                    # This is actually a list of object files from the linkstamp steps
+                    flags = ["%{linkstamp_paths}"],
+                    iterate_over = "linkstamp_paths",
+                    expand_if_available = "linkstamp_paths",
+                ),
+            ],
+        ),
+        flag_set(
+            actions = all_link_actions,
+            flag_groups = [
+                flag_group(
+                    flags = ["@%{thinlto_param_file}"],
+                    expand_if_available = "libraries_to_link",
+                    expand_if_true = "thinlto_param_file",
+                ),
+                flag_group(
+                    iterate_over = "libraries_to_link",
+                    flag_groups = [
+                        flag_group(
+                            flags = ["-Wl,--start-lib"],
+                            expand_if_equal = variable_with_value(
+                                name = "libraries_to_link.type",
+                                value = "object_file_group",
+                            ),
+                        ),
+                        flag_group(
+                            flags = ["-Wl,-whole-archive"],
+                            expand_if_true = "libraries_to_link.is_whole_archive",
+                        ),
+                        flag_group(
+                            flags = ["%{libraries_to_link.object_files}"],
+                            iterate_over = "libraries_to_link.object_files",
+                            expand_if_equal = variable_with_value(
+                                name = "libraries_to_link.type",
+                                value = "object_file_group",
+                            ),
+                        ),
+                        flag_group(
+                            flags = ["%{libraries_to_link.name}"],
+                            expand_if_equal = variable_with_value(
+                                name = "libraries_to_link.type",
+                                value = "object_file",
+                            ),
+                        ),
+                        flag_group(
+                            flags = ["%{libraries_to_link.name}"],
+                            expand_if_equal = variable_with_value(
+                                name = "libraries_to_link.type",
+                                value = "interface_library",
+                            ),
+                        ),
+                        flag_group(
+                            flags = ["%{libraries_to_link.name}"],
+                            expand_if_equal = variable_with_value(
+                                name = "libraries_to_link.type",
+                                value = "static_library",
+                            ),
+                        ),
+                        flag_group(
+                            flags = ["-l%{libraries_to_link.name}"],
+                            expand_if_equal = variable_with_value(
+                                name = "libraries_to_link.type",
+                                value = "dynamic_library",
+                            ),
+                        ),
+                        flag_group(
+                            flags = ["-l:%{libraries_to_link.name}"],
+                            expand_if_equal = variable_with_value(
+                                name = "libraries_to_link.type",
+                                value = "versioned_dynamic_library",
+                            ),
+                        ),
+                        flag_group(
+                            flags = ["-Wl,-no-whole-archive"],
+                            expand_if_true = "libraries_to_link.is_whole_archive",
+                        ),
+                        flag_group(
+                            flags = ["-Wl,--end-lib"],
+                            expand_if_equal = variable_with_value(
+                                name = "libraries_to_link.type",
+                                value = "object_file_group",
+                            ),
+                        ),
+                    ],
+                    expand_if_available = "libraries_to_link",
+                ),
+            ],
+        ),
+
+        # Configure the header parsing and preprocessing.
+        flag_set(
+            actions = [ACTION_NAMES.cpp_header_parsing],
+            flags = ["-xc++-header", "-fsyntax-only"],
+            features = ["parse_headers"],
+        ),
+
+        # Note: user compile flags should be nearly last -- you probably
+        # don't want to put any more features after this!
+        flag_set(
+            actions = [
+                ACTION_NAMES.c_compile,
+                ACTION_NAMES.cpp_compile,
+                ACTION_NAMES.linkstamp_compile,
+                ACTION_NAMES.assemble,
+                ACTION_NAMES.preprocess_assemble,
+                ACTION_NAMES.cpp_header_parsing,
+                ACTION_NAMES.cpp_module_compile,
+                ACTION_NAMES.cpp_module_codegen,
+                ACTION_NAMES.clif_match,
+            ],
+            flag_groups = [
+                flag_group(
+                    flags = ["%{user_compile_flags}"],
+                    iterate_over = "user_compile_flags",
+                    expand_if_available = "user_compile_flags",
+                ),
+            ],
+        ),
+        flag_set(
+            actions = all_link_actions,
+            flag_groups = [
+                flag_group(
+                    flags = ["%{user_link_flags}"],
+                    iterate_over = "user_link_flags",
+                    expand_if_available = "user_link_flags",
+                ),
+            ],
+        ),
+        ## Options which need to go late -- after all the user options -- go here.
+        flag_set(
+            # One might hope that these options would only be needed for C++
+            # compiles. But, sadly, users compile ".c" files with custom
+            # copts=["-x", "c++"], and expect that to be able to find C++ stdlib
+            # headers. It might be worth pondering how blaze could support this sort
+            # of use-case better.
+            actions = preprocessor_compile_actions +
+                      [ACTION_NAMES.cc_flags_make_variable],
+            flags = [
+                "-isystem",
+                emscripten_root + "/system/lib/libc/musl/arch/emscripten",
+                "-isystem",
+                emscripten_root + "/system/lib/libc/musl/arch/js",
+                "-isystem",
+                emscripten_root + "/system/local/include",
+                "-isystem",
+                emscripten_root + "/system/include/compat",
+                "-isystem",
+                emscripten_root + "/system/include",
+                "-isystem",
+                emscripten_root + "/system/include/libcxx",
+                "-isystem",
+                emscripten_root + "/system/lib/libcxxabi/include",
+                "-isystem",
+                emscripten_root + "/system/lib/compiler-rt/include",
+                "-isystem",
+                emscripten_root + "/system/include/libc",
+                "-isystem",
+                emscripten_root + "/system/include/gfx",
+                "-isystem",
+                emscripten_root + "/system/include/SDL",
+                "-isystem",
+                emscripten_root + "/lib/clang/12.0.0/include",
+            ],
+        ),
+        # Inputs and outputs
+        flag_set(
+            actions = [
+                ACTION_NAMES.c_compile,
+                ACTION_NAMES.cpp_compile,
+                ACTION_NAMES.linkstamp_compile,
+                ACTION_NAMES.assemble,
+                ACTION_NAMES.preprocess_assemble,
+                ACTION_NAMES.cpp_header_parsing,
+                ACTION_NAMES.cpp_module_compile,
+                ACTION_NAMES.cpp_module_codegen,
+                ACTION_NAMES.clif_match,
+            ],
+            flag_groups = [
+                flag_group(
+                    flags = ["-MD", "-MF", "%{dependency_file}"],
+                    expand_if_available = "dependency_file",
+                ),
+            ],
+        ),
+        flag_set(
+            actions = [
+                ACTION_NAMES.c_compile,
+                ACTION_NAMES.cpp_compile,
+                ACTION_NAMES.linkstamp_compile,
+                ACTION_NAMES.assemble,
+                ACTION_NAMES.preprocess_assemble,
+                ACTION_NAMES.cpp_header_parsing,
+                ACTION_NAMES.cpp_module_compile,
+                ACTION_NAMES.cpp_module_codegen,
+                ACTION_NAMES.clif_match,
+            ],
+            flag_groups = [
+                flag_group(
+                    flags = ["-c", "%{source_file}"],
+                    expand_if_available = "source_file",
+                ),
+            ],
+        ),
+        flag_set(
+            actions = [
+                ACTION_NAMES.c_compile,
+                ACTION_NAMES.cpp_compile,
+                ACTION_NAMES.linkstamp_compile,
+                ACTION_NAMES.assemble,
+                ACTION_NAMES.preprocess_assemble,
+                ACTION_NAMES.cpp_header_parsing,
+                ACTION_NAMES.cpp_module_compile,
+                ACTION_NAMES.cpp_module_codegen,
+                ACTION_NAMES.clif_match,
+            ],
+            flag_groups = [
+                flag_group(
+                    flags = ["-S"],
+                    expand_if_available = "output_assembly_file",
+                ),
+                flag_group(
+                    flags = ["-E"],
+                    expand_if_available = "output_preprocess_file",
+                ),
+                flag_group(
+                    flags = ["-o", "%{output_file}"],
+                    expand_if_available = "output_file",
+                ),
+            ],
+        ),
+        flag_set(
+            actions = all_link_actions,
+            flag_groups = [
+                flag_group(
+                    flags = ["-o", "%{output_execpath}"],
+                    expand_if_available = "output_execpath",
+                ),
+            ],
+        ),
+        # And finally, the params file!
+        flag_set(
+            actions = all_link_actions,
+            flag_groups = [
+                flag_group(
+                    flags = ["@%{linker_param_file}"],
+                    expand_if_available = "linker_param_file",
+                ),
+            ],
+        ),
+        flag_set(
+            actions = all_compile_actions,
+            flags = [
+                "-Wno-builtin-macro-redefined",
+                # Genrules may not escape quotes enough for these, so
+                # don't put them into $(CC_FLAGS):
+                '-D__DATE__="redacted"',
+                '-D__TIMESTAMP__="redacted"',
+                '-D__TIME__="redacted"',
+            ],
+        ),
+        flag_set(
+            actions = all_compile_actions,
+            flags = ["-Werror"],
+            features = ["wasm_warnings_as_errors"],
+        ),
+    ]
+
+    crosstool_default_env_sets = [
+        # Use llvm backend.  Off by default, enabled via --features=llvm_backend
+        env_set(
+            actions = all_compile_actions +
+                      all_link_actions +
+                      [ACTION_NAMES.cpp_link_static_library],
+            env_entries = [env_entry(key = "EMCC_WASM_BACKEND", value = "1")],
+            with_features = [with_feature_set(features = ["llvm_backend"])],
+        ),
+        # Debug compile and link. Off by default, enabled via --features=emcc_debug
+        env_set(
+            actions = all_compile_actions,
+            env_entries = [env_entry(key = "EMCC_DEBUG", value = "1")],
+            with_features = [with_feature_set(features = ["emcc_debug"])],
+        ),
+
+        # Debug only link step. Off by default, enabled via --features=emcc_debug_link
+        env_set(
+            actions = all_link_actions,
+            env_entries = [env_entry(key = "EMCC_DEBUG", value = "1")],
+            with_features = [
+                with_feature_set(features = ["emcc_debug"]),
+                with_feature_set(features = ["emcc_debug_link"]),
+            ],
+        ),
+    ]
+
+    crosstool_default_flags_feature = feature(
+        name = "crosstool_default_flags",
+        enabled = True,
+        flag_sets = crosstool_default_flag_sets,
+        env_sets = crosstool_default_env_sets,
+    )
+
+    features.append(crosstool_default_flags_feature)
+
+    cxx_builtin_include_directories = [
+        emscripten_version + "/system/lib/libc/musl/arch/emscripten",
+        emscripten_version + "/system/lib/libc/musl/arch/js",
+        emscripten_version + "/system/local/include",
+        emscripten_version + "/system/include/compat",
+        emscripten_version + "/system/include",
+        emscripten_version + "/system/include/libcxx",
+        emscripten_version + "/system/lib/compiler-rt/include",
+        emscripten_version + "/system/lib/libcxxabi/include",
+        emscripten_version + "/system/include/libc",
+        emscripten_version + "/system/include/gfx",
+        emscripten_version + "/system/include/SDL",
+        emscripten_version + "/lib/clang/12.0.0/include",
+    ]
+
+    artifact_name_patterns = []
+
+    make_variables = []
+
+    out = ctx.actions.declare_file(ctx.label.name)
+    ctx.actions.write(out, "Fake executable")
+    return [
+        cc_common.create_cc_toolchain_config_info(
+            ctx = ctx,
+            features = features,
+            action_configs = action_configs,
+            artifact_name_patterns = artifact_name_patterns,
+            cxx_builtin_include_directories = cxx_builtin_include_directories,
+            toolchain_identifier = toolchain_identifier,
+            host_system_name = host_system_name,
+            target_system_name = target_system_name,
+            target_cpu = target_cpu,
+            target_libc = target_libc,
+            compiler = compiler,
+            abi_version = abi_version,
+            abi_libc_version = abi_libc_version,
+            tool_paths = tool_paths,
+            make_variables = make_variables,
+            builtin_sysroot = builtin_sysroot,
+            cc_target_os = cc_target_os,
+        ),
+        DefaultInfo(
+            executable = out,
+        ),
+    ]
+
+emscripten_cc_toolchain_config_rule = rule(
+    implementation = _impl,
+    attrs = {
+        "cpu": attr.string(mandatory = True, values = ["asmjs", "wasm"]),
+        "emscripten_version": attr.string(mandatory = True),
+    },
+    provides = [CcToolchainConfigInfo],
+    executable = True,
+)
diff --git a/bazel/emscripten_toolchain/emar.sh b/bazel/emscripten_toolchain/emar.sh
new file mode 100755
index 0000000000..965442e34c
--- /dev/null
+++ b/bazel/emscripten_toolchain/emar.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source emscripten_toolchain/env.sh
+
+exec python3 $EMSCRIPTEN/emar.py "$@"
diff --git a/bazel/emscripten_toolchain/emcc.sh b/bazel/emscripten_toolchain/emcc.sh
new file mode 100755
index 0000000000..66d00b6c9a
--- /dev/null
+++ b/bazel/emscripten_toolchain/emcc.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source emscripten_toolchain/env.sh
+
+exec python3 external/emscripten/emscripten/emcc.py "$@"
diff --git a/bazel/emscripten_toolchain/emcc_link.sh b/bazel/emscripten_toolchain/emcc_link.sh
new file mode 100755
index 0000000000..9d0f8e208b
--- /dev/null
+++ b/bazel/emscripten_toolchain/emcc_link.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source emscripten_toolchain/env.sh
+
+exec python3 emscripten_toolchain/link_wrapper.py "$@"
diff --git a/bazel/emscripten_toolchain/emscripten.BUILD b/bazel/emscripten_toolchain/emscripten.BUILD
new file mode 100644
index 0000000000..6f11852874
--- /dev/null
+++ b/bazel/emscripten_toolchain/emscripten.BUILD
@@ -0,0 +1,6 @@
+package(default_visibility = ['//visibility:public'])
+
+filegroup(
+    name = "all",
+    srcs = glob(["**"]),
+)
diff --git a/bazel/emscripten_toolchain/emscripten_config b/bazel/emscripten_toolchain/emscripten_config
new file mode 100644
index 0000000000..4a77344ef0
--- /dev/null
+++ b/bazel/emscripten_toolchain/emscripten_config
@@ -0,0 +1,9 @@
+import os
+
+ROOT_DIR = os.environ["ROOT_DIR"]
+EMSCRIPTEN_ROOT = os.environ["EMSCRIPTEN"]
+
+LLVM_ROOT = ROOT_DIR + "/external/emscripten/bin"
+EMSCRIPTEN_NATIVE_OPTIMIZER = LLVM_ROOT + "/optimizer"
+NODE_JS = ROOT_DIR + "/external/nodejs_linux_amd64/bin/node"
+BINARYEN_ROOT = ROOT_DIR + "/external/emscripten"
diff --git a/bazel/emscripten_toolchain/env.sh b/bazel/emscripten_toolchain/env.sh
new file mode 100755
index 0000000000..005fa8767a
--- /dev/null
+++ b/bazel/emscripten_toolchain/env.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+export ROOT_DIR=`(pwd -P)`
+export EMSCRIPTEN=${ROOT_DIR}/external/emscripten/emscripten
+
+export EM_CONFIG=${ROOT_DIR}/emscripten_toolchain/emscripten_config
+export EM_CACHE=${ROOT_DIR}/emscripten_toolchain/cache
diff --git a/bazel/emscripten_toolchain/link_wrapper.py b/bazel/emscripten_toolchain/link_wrapper.py
new file mode 100644
index 0000000000..a746ae8fd3
--- /dev/null
+++ b/bazel/emscripten_toolchain/link_wrapper.py
@@ -0,0 +1,146 @@
+#!/usr/bin/env python
+"""wrapper around emcc link step.
+
+This wrapper currently serves the following purposes.
+
+1. Ensures we always link to file with .js extension. The upstream default
+   it to link to an llvm bitcode file which is never (AFAICT) want to do that.
+
+2. When building with --config=wasm the final output is multiple files, usually
+   at least one .js and one .wasm file. Since the cc_binary link step only
+   allows a single output, we must tar up the outputs into a single file.
+
+3. Add quotes around arguments that need them in the response file to work
+   around a bazel quirk.
+"""
+
+from __future__ import print_function
+
+import os
+import subprocess
+import sys
+
+# Only argument should be @path/to/parameter/file
+assert sys.argv[1][0] == '@'
+param_filename = sys.argv[1][1:]
+param_file_args = [l.strip() for l in open(param_filename, 'r').readlines()]
+
+output_index = param_file_args.index('-o') + 1
+orig_output = js_output = param_file_args[output_index]
+outdir = os.path.dirname(orig_output)
+
+# google3-only(TODO(b/139440956): Default to False once the bug is fixed)
+replace_response_file = any(' ' in a for a in param_file_args)
+
+if not os.path.splitext(orig_output)[1]:
+  js_output = orig_output + '.js'
+  param_file_args[output_index] = js_output
+  replace_response_file = True
+
+# Re-write response file if needed.
+if replace_response_file:
+  new_param_filename = param_filename + '.modified'
+  with open(new_param_filename, 'w') as f:
+    for param in param_file_args:
+      if ' ' in param:
+        f.write('"%s"' % param)
+      else:
+        f.write(param)
+      f.write('\n')
+  sys.argv[1] = '@' + new_param_filename
+
+emcc_py = os.path.join(os.environ['EMSCRIPTEN'], 'emcc.py')
+rtn = subprocess.call(['python3', emcc_py] + sys.argv[1:])
+if rtn != 0:
+  sys.exit(1)
+
+js_name = os.path.basename(js_output)
+base_name = os.path.splitext(js_name)[0]
+
+files = []
+extensions = [
+    '.js',
+    '.wasm',
+    '.wasm.map',
+    '.js.mem',
+    '.fetch.js',
+    '.worker.js',
+    '.data',
+    '.js.symbols',
+    '.wasm.debug.wasm'
+]
+
+for ext in extensions:
+  filename = base_name + ext
+  if os.path.exists(os.path.join(outdir, filename)):
+    files.append(filename)
+
+wasm_base = os.path.join(outdir, base_name + '.wasm')
+if os.path.exists(wasm_base + '.debug.wasm') and os.path.exists(wasm_base):
+  # If we have a .wasm.debug.wasm file and a .wasm file, we need to rewrite the
+  # section in the .wasm file that refers to it. The path that's in there
+  # is the blaze output path; we want it to be just the filename.
+
+  llvm_objcopy = os.path.join(
+      os.environ['EMSCRIPTEN'], 'llvm-bin/llvm-objcopy')
+  # First, check to make sure the .wasm file has the header that needs to be
+  # rewritten.
+  rtn = subprocess.call([
+      llvm_objcopy,
+      '--dump-section=external_debug_info=/dev/null',
+      wasm_base], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+  if rtn == 0:
+    # If llvm-objcopy did not return an error, the external_debug_info section
+    # must exist, so we're good to continue.
+
+    # Next we need to convert length of the filename to LEB128.
+    # Start by converting the length of the filename to a bit string.
+    bit_string = '{0:b}'.format(len(base_name + '.wasm.debug.wasm'))
+
+    # Pad the bit string with 0s so that its length is a multiple of 7.
+    while len(bit_string) % 7 != 0:
+      bit_string = '0' + bit_string
+
+    # Break up our bit string into chunks of 7.
+    # We do this backwards because the final format is little-endian.
+    final_bytes = bytearray()
+    for i in reversed(range(0, len(bit_string), 7)):
+      binary_part = bit_string[i:i + 7]
+      if i != 0:
+        # Every chunk except the last one needs to be prepended with '1'.
+        # The length of each chunk is 7, so that one has an implicit '0'.
+        binary_part = '1' + binary_part
+      final_bytes.append(int(binary_part, 2))
+    # Finally, add the actual filename.
+    final_bytes.extend(base_name + '.wasm.debug.wasm')
+
+    # Write our length + filename bytes to a temp file.
+    with open('debugsection.tmp', 'wb+') as f:
+      f.write(final_bytes)
+      f.close()
+
+    # First delete the old section.
+    subprocess.check_call([
+        llvm_objcopy,
+        wasm_base,
+        '--remove-section=external_debug_info'])
+    # Rewrite section with the new size and filename from the temp file.
+    subprocess.check_call([
+        llvm_objcopy,
+        wasm_base,
+        '--add-section=external_debug_info=debugsection.tmp'])
+
+# If we have more than one output file then create tarball
+if len(files) > 1:
+  cmd = ['tar', 'cf', 'tmp.tar'] + files
+  subprocess.check_call(cmd, cwd=outdir)
+  os.rename(os.path.join(outdir, 'tmp.tar'), orig_output)
+elif len(files) == 1:
+  # Otherwise, if only have a single output than move it to the expected name
+  if files[0] != os.path.basename(orig_output):
+    os.rename(os.path.join(outdir, files[0]), orig_output)
+else:
+  print('emcc.py did not appear to output any known files!')
+  sys.exit(1)
+
+sys.exit(0)
diff --git a/bazel/emscripten_toolchain/wasm_binary.py b/bazel/emscripten_toolchain/wasm_binary.py
new file mode 100644
index 0000000000..6bb30db509
--- /dev/null
+++ b/bazel/emscripten_toolchain/wasm_binary.py
@@ -0,0 +1,84 @@
+"""Unpackages a bazel emscripten archive for use in a bazel BUILD rule.
+
+This script will take a tar archive containing the output of the emscripten
+toolchain. This file contains any output files produced by a wasm_cc_binary or a
+cc_binary built with --config=wasm. The files are extracted into the given
+output path.
+
+The name of archive is expected to be of the format `foo` or `foo.XXX` and
+the contents are expected to be foo.js and foo.wasm.
+
+Several optional files may also be in the archive, including but not limited to
+foo.js.mem, pthread-main.js, and foo.wasm.map.
+
+If the file is not a tar archive, the passed file will simply be copied to its
+destination.
+
+This script and its accompanying Bazel rule should allow you to extract a
+WebAssembly binary into a larger web application.
+"""
+
+import os
+import subprocess
+import sys
+
+from absl import app
+from absl import flags
+
+FLAGS = flags.FLAGS
+flags.DEFINE_string('archive', None, 'The the archive to extract from.')
+flags.DEFINE_string('output_path', None, 'The path to extract into.')
+
+
+def ensure(f):
+  if not os.path.exists(f):
+    with open(f, 'w'):
+      pass
+
+
+def check(f):
+  if not os.path.exists(f):
+    raise Exception('Expected file in archive: %s' % f)
+
+
+def main(argv):
+  basename = os.path.basename(FLAGS.archive)
+  stem = basename.split('.')[0]
+
+  # Check the type of the input file
+  mimetype_bytes = subprocess.check_output(['file', '-Lib', FLAGS.archive])
+  mimetype = mimetype_bytes.decode(sys.stdout.encoding)
+
+  # If we have a tar, extract all files. If we have just a single file, copy it.
+  if 'tar' in mimetype:
+    subprocess.check_call(
+        ['tar', 'xf', FLAGS.archive, '-C', FLAGS.output_path])
+  elif 'binary' in mimetype:
+    subprocess.check_call([
+        'cp',
+        FLAGS.archive,
+        os.path.join(FLAGS.output_path, stem + '.wasm')])
+  elif 'text' in mimetype:
+    subprocess.check_call([
+        'cp',
+        FLAGS.archive,
+        os.path.join(FLAGS.output_path, stem + '.js')])
+  else:
+    subprocess.check_call(['cp', FLAGS.archive, FLAGS.output_path])
+
+  # At least one of these two files should exist at this point.
+  ensure(os.path.join(FLAGS.output_path, stem + '.js'))
+  ensure(os.path.join(FLAGS.output_path, stem + '.wasm'))
+
+  # And can optionally contain these extra files.
+  ensure(os.path.join(FLAGS.output_path, stem + '.wasm.map'))
+  ensure(os.path.join(FLAGS.output_path, stem + '.worker.js'))
+  ensure(os.path.join(FLAGS.output_path, stem + '.js.mem'))
+  ensure(os.path.join(FLAGS.output_path, stem + '.data'))
+  ensure(os.path.join(FLAGS.output_path, stem + '.fetch.js'))
+  ensure(os.path.join(FLAGS.output_path, stem + '.js.symbols'))
+  ensure(os.path.join(FLAGS.output_path, stem + '.wasm.debug.wasm'))
+
+
+if __name__ == '__main__':
+  app.run(main)
diff --git a/bazel/emscripten_toolchain/wasm_cc_binary.bzl b/bazel/emscripten_toolchain/wasm_cc_binary.bzl
new file mode 100644
index 0000000000..01780e2cd4
--- /dev/null
+++ b/bazel/emscripten_toolchain/wasm_cc_binary.bzl
@@ -0,0 +1,150 @@
+"""wasm_cc_binary rule for compiling C++ targets to WebAssembly.
+"""
+
+def _wasm_transition_impl(settings, attr):
+    _ignore = (settings, attr)
+
+    features = list(settings["//command_line_option:features"])
+    linkopts = list(settings["//command_line_option:linkopt"])
+
+    if attr.threads == "emscripten":
+        # threads enabled
+        features.append("use_pthreads")
+    elif attr.threads == "off":
+        # threads disabled
+        features.append("-use_pthreads")
+
+    if attr.exit_runtime == True:
+        features.append("exit_runtime")
+
+    if attr.backend == "llvm":
+        features.append("llvm_backend")
+    elif attr.backend == "emscripten":
+        features.append("-llvm_backend")
+
+    if attr.simd:
+        features.append("wasm_simd")
+
+    return {
+        "//command_line_option:compiler": "emscripten",
+        "//command_line_option:crosstool_top": "//emscripten_toolchain:everything",
+        "//command_line_option:cpu": "wasm",
+        "//command_line_option:features": features,
+        "//command_line_option:dynamic_mode": "off",
+        "//command_line_option:linkopt": linkopts,
+        "//command_line_option:platforms": [],
+        "//command_line_option:custom_malloc": "//emscripten_toolchain:malloc",
+    }
+
+_wasm_transition = transition(
+    implementation = _wasm_transition_impl,
+    inputs = [
+        "//command_line_option:features",
+        "//command_line_option:linkopt",
+    ],
+    outputs = [
+        "//command_line_option:compiler",
+        "//command_line_option:cpu",
+        "//command_line_option:crosstool_top",
+        "//command_line_option:features",
+        "//command_line_option:dynamic_mode",
+        "//command_line_option:linkopt",
+        "//command_line_option:platforms",
+        "//command_line_option:custom_malloc",
+    ],
+)
+
+def _wasm_binary_impl(ctx):
+    cc_target = ctx.attr.cc_target[0]
+
+    args = [
+        "--output_path={}".format(ctx.outputs.loader.dirname),
+    ] + [
+        ctx.expand_location("--archive=$(location {})".format(
+            cc_target.label,
+        ), [cc_target]),
+    ]
+    outputs = [
+        ctx.outputs.loader,
+        ctx.outputs.wasm,
+        ctx.outputs.map,
+        ctx.outputs.mem,
+        ctx.outputs.fetch,
+        ctx.outputs.worker,
+        ctx.outputs.data,
+        ctx.outputs.symbols,
+        ctx.outputs.dwarf,
+    ]
+
+    ctx.actions.run(
+        inputs = ctx.files.cc_target,
+        outputs = outputs,
+        arguments = args,
+        executable = ctx.executable._wasm_binary_extractor,
+    )
+
+    return DefaultInfo(
+        files = depset(outputs),
+        # This is needed since rules like web_test usually have a data
+        # dependency on this target.
+        data_runfiles = ctx.runfiles(transitive_files = depset(outputs)),
+    )
+
+def _wasm_binary_outputs(name, cc_target):
+    basename = cc_target.name
+    basename = basename.split(".")[0]
+    outputs = {
+        "loader": "{}/{}.js".format(name, basename),
+        "wasm": "{}/{}.wasm".format(name, basename),
+        "map": "{}/{}.wasm.map".format(name, basename),
+        "mem": "{}/{}.js.mem".format(name, basename),
+        "fetch": "{}/{}.fetch.js".format(name, basename),
+        "worker": "{}/{}.worker.js".format(name, basename),
+        "data": "{}/{}.data".format(name, basename),
+        "symbols": "{}/{}.js.symbols".format(name, basename),
+        "dwarf": "{}/{}.wasm.debug.wasm".format(name, basename),
+    }
+
+    return outputs
+
+# Wraps a C++ Blaze target, extracting the appropriate files.
+#
+# This rule will transition to the emscripten toolchain in order
+# to build the the cc_target as a WebAssembly binary.
+#
+# Args:
+#   name: The name of the rule.
+#   cc_target: The cc_binary or cc_library to extract files from.
+wasm_cc_binary = rule(
+    implementation = _wasm_binary_impl,
+    attrs = {
+        "backend": attr.string(
+            default = "_default",
+            values = ["_default", "emscripten", "llvm"],
+        ),
+        "cc_target": attr.label(
+            cfg = _wasm_transition,
+            mandatory = True,
+        ),
+        "exit_runtime": attr.bool(
+            default = False,
+        ),
+        "threads": attr.string(
+            default = "_default",
+            values = ["_default", "emscripten", "off"],
+        ),
+        "simd": attr.bool(
+            default = False,
+        ),
+        "_allowlist_function_transition": attr.label(
+            default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
+        ),
+        "_wasm_binary_extractor": attr.label(
+            executable = True,
+            allow_files = True,
+            cfg = "exec",
+            default = Label("//emscripten_toolchain:wasm_binary"),
+        ),
+    },
+    outputs = _wasm_binary_outputs,
+)
diff --git a/bazel/emscripten_toolchain/wasm_rules.bzl b/bazel/emscripten_toolchain/wasm_rules.bzl
new file mode 100644
index 0000000000..1c1c409ed5
--- /dev/null
+++ b/bazel/emscripten_toolchain/wasm_rules.bzl
@@ -0,0 +1,6 @@
+"""Rules related to C++ and WebAssembly.
+"""
+
+load("//emscripten_toolchain:wasm_cc_binary.bzl", _wasm_cc_binary = "wasm_cc_binary")
+
+wasm_cc_binary = _wasm_cc_binary
diff --git a/bazel/hello-world/BUILD b/bazel/hello-world/BUILD
new file mode 100644
index 0000000000..d0ef7cdd18
--- /dev/null
+++ b/bazel/hello-world/BUILD
@@ -0,0 +1,12 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary")
+load("//emscripten_toolchain:wasm_rules.bzl", "wasm_cc_binary")
+
+cc_binary(
+    name = "hello-world",
+    srcs = ["hello-world.cc"],
+)
+
+wasm_cc_binary(
+    name = "hello-world-wasm",
+    cc_target = ":hello-world",
+)
diff --git a/bazel/hello-world/hello-world.cc b/bazel/hello-world/hello-world.cc
new file mode 100644
index 0000000000..ee72c53171
--- /dev/null
+++ b/bazel/hello-world/hello-world.cc
@@ -0,0 +1,6 @@
+#include <iostream>
+
+int main(int argc, char** argv) {
+  std::cout << "hello world!" << std::endl;
+  return 0;
+}
diff --git a/scripts/test_bazel.sh b/scripts/test_bazel.sh
new file mode 100755
index 0000000000..f2a5e3c04e
--- /dev/null
+++ b/scripts/test_bazel.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+echo "test bazel"
+
+set -x
+set -e
+
+cd bazel
+bazel build //hello-world:hello-world-wasm
diff --git a/scripts/update_bazel_workspace.sh b/scripts/update_bazel_workspace.sh
new file mode 100755
index 0000000000..fb58f046ad
--- /dev/null
+++ b/scripts/update_bazel_workspace.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+# This script will update emsdk/bazel/WORKSPACE to the latest version of
+# emscripten. It reads emsdk/emscripten-releases-tags.txt to get the latest
+# version number. Then, it downloads the prebuilts for that version and computes
+# the sha256sum for the archive. It then puts all this information into the
+# emsdk/bazel/WORKSPACE file.
+
+ERR=0
+# Attempt to change to the emsdk root directory
+cd $(dirname $0)/..
+
+# If the previous command succeeded. We are in the emsdk root. Check to make
+# sure the files and directories we need are present.
+if [[ $? = 0 ]]; then
+  if [[ ! -f emscripten-releases-tags.txt ]]; then
+    echo "Cannot find emscripten-releases-tags.txt."
+    ERR=1
+  fi
+
+  if [[ ! -d bazel ]]; then
+    echo "Cannot find the bazel directory."
+    ERR=1
+  elif [[ ! -f bazel/WORKSPACE ]]; then
+    echo "Cannot find bazel/WORKSPACE."
+    ERR=1
+  fi
+else
+  ERR=1
+fi
+
+if [[ $ERR = 1 ]]; then
+  echo "Unable to cd into the emsdk root directory."
+  exit 1
+fi
+
+URL1=https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/
+URL2=/wasm-binaries.tbz2
+
+# Get the latest version number from emscripten-releases-tag.txt.
+VER=$(grep -oP '(?<=latest\": \")([\d\.]+)(?=\")' \
+        emscripten-releases-tags.txt \
+      | sed --expression "s/\./\\\./g")
+# Based on the latest version number, get the commit hash for that version.
+HASH=$(grep "${VER}" emscripten-releases-tags.txt \
+      | grep -v latest \
+      | cut -f4 -d\")
+# Download and compute the sha256sum for the archive with the prebuilts.
+SHA=$(curl "${URL1}${HASH}${URL2}" 2>/dev/null \
+      | sha256sum \
+      | awk '{print $1}')
+# Get the line number on which the sha256 sum lives for emscripten.
+# This will always be one line after the name of the rule.
+SHALINE=$(($(grep -n 'name = "emscripten"' bazel/WORKSPACE \
+      | sed 's/^\([[:digit:]]*\).*$/\1/')+1))
+
+# Insert the new commit hash into the url.
+sed -i "s!\(${URL1}\)\([[:alnum:]]*\)\(${URL2}\)!\1${HASH}\3!" bazel/WORKSPACE
+# Insert the new version number.
+sed -i "s!\(# emscripten \)\(.*\)!\1${VER}!" bazel/WORKSPACE
+# Insert the new sha256 sum.
+sed -i "${SHALINE}s!\"[[:alnum:]]*\"!\"${SHA}\"!" bazel/WORKSPACE
+
+echo "Done!"

From a94f2fe06c7c7c8818eb1c6207b4c3f7a395e962 Mon Sep 17 00:00:00 2001
From: walkingeyerobot <mitch@thefoley.net>
Date: Fri, 11 Sep 2020 20:15:19 -0400
Subject: [PATCH 069/161] update bazel workspace for emscripten 2.0.3 (#613)

* update bazel workspace for emscripten 2.0.3

* test to make sure WORKSPACE is up to date

* make it clear what happened when WORKSPACE is out of date

* intentionally add error to make sure circleci fails properly

* revert intentionally bad commit

* increase visibility of failure message

Co-authored-by: Mitch Foley <mitchfoley@google.com>
---
 bazel/WORKSPACE       |  6 +++---
 scripts/test_bazel.sh | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index 971c714dd2..22d523856c 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -8,12 +8,12 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
 
-# emscripten 2.0.2
+# emscripten 2.0.3
 http_archive(
     name = "emscripten",
-    sha256 = "9febbc252372efee82e62d548f510dfc85ade6661f5f3be28823848d4757d614",
+    sha256 = "3d1bcbf01104c83595f769f65f9c57eceb6e9f6be8d115e80ff6a44c22570b32",
     strip_prefix = "install",
-    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/ede25d889a0abe63360d4c5d420087c8753b8bbe/wasm-binaries.tbz2",
+    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/7a7f38ca19da152d4cd6da4776921a0f1e3f3e3f/wasm-binaries.tbz2",
     build_file = "//emscripten_toolchain:emscripten.BUILD",
     type = "tar.bz2",
 )
diff --git a/scripts/test_bazel.sh b/scripts/test_bazel.sh
index f2a5e3c04e..f1ba3c96df 100755
--- a/scripts/test_bazel.sh
+++ b/scripts/test_bazel.sh
@@ -5,5 +5,20 @@ echo "test bazel"
 set -x
 set -e
 
+# Get the latest version number from emscripten-releases-tag.txt.
+VER=$(grep -oP '(?<=latest\": \")([\d\.]+)(?=\")' \
+        emscripten-releases-tags.txt \
+      | sed --expression "s/\./\\\./g")
+# Based on the latest version number, get the commit hash for that version.
+HASH=$(grep "${VER}" emscripten-releases-tags.txt \
+      | grep -v latest \
+      | cut -f4 -d\")
+      
+FAILMSG="!!! scripts/update_bazel_toolchain.sh needs to be run !!!"
+
+# Ensure the WORKSPACE file is up to date with the latest version.
+grep ${VER} bazel/WORKSPACE || (echo ${FAILMSG} && false)
+grep ${HASH} bazel/WORKSPACE || (echo ${FAILMSG} && false)
+
 cd bazel
 bazel build //hello-world:hello-world-wasm

From edc53e7a0a5d676902f01bc34fabf88fa2b3ef0d Mon Sep 17 00:00:00 2001
From: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
Date: Tue, 15 Sep 2020 17:14:52 -0500
Subject: [PATCH 070/161] Add missing python locations to emsdk.ps1 (#615)

---
 emsdk.ps1           | 2 ++
 emsdk_manifest.json | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/emsdk.ps1 b/emsdk.ps1
index 183a145eff..694d8fe408 100644
--- a/emsdk.ps1
+++ b/emsdk.ps1
@@ -1,6 +1,8 @@
 $ScriptDirectory = Split-Path -parent $PSCommandPath
 
 $PythonLocations = $(
+    "python\3.7.4-pywin32_64bit\python.exe",
+    "python\3.7.4_64bit\python.exe",
     "python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe",
     "python\2.7.13.1_32bit\python-2.7.13\python.exe",
     "python\2.7.5.3_64bit\python.exe",
diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 51bd33d447..b1e59d298e 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -477,7 +477,7 @@
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "python-3.7.4-pywin32-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "win"
   },
   {
@@ -507,7 +507,7 @@
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "python-3.7.4-64bit", "java-8.152-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "win"
   },
   {

From 88b4ec65923815c3077e3637eefb54ab272d2646 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Wed, 16 Sep 2020 08:14:41 -0700
Subject: [PATCH 071/161] 2.0.4 (#619)

---
 bazel/WORKSPACE              | 6 +++---
 emscripten-releases-tags.txt | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index 22d523856c..3ca6586254 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -8,12 +8,12 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
 
-# emscripten 2.0.3
+# emscripten 2.0.4
 http_archive(
     name = "emscripten",
-    sha256 = "3d1bcbf01104c83595f769f65f9c57eceb6e9f6be8d115e80ff6a44c22570b32",
+    sha256 = "bdce4b6253de29cc779810d8a14d944e439c7670f3befe4550b98a48fd84854c",
     strip_prefix = "install",
-    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/7a7f38ca19da152d4cd6da4776921a0f1e3f3e3f/wasm-binaries.tbz2",
+    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/eefeb3e623af023844ac477d70d1fd8a668f5110/wasm-binaries.tbz2",
     build_file = "//emscripten_toolchain:emscripten.BUILD",
     type = "tar.bz2",
 )
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index c5b79468a6..a0c500d0fb 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.3",
+  "latest": "2.0.4",
   "releases": {
+    "2.0.4":   "eefeb3e623af023844ac477d70d1fd8a668f5110",
     "2.0.3":   "7a7f38ca19da152d4cd6da4776921a0f1e3f3e3f",
     "2.0.2":   "ede25d889a0abe63360d4c5d420087c8753b8bbe",
     "2.0.1":   "13e29bd55185e3c12802bc090b4507901856b2ba",

From 843c1955fac6eddbbd76f67eff8b1a55382cb417 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Wed, 16 Sep 2020 15:48:55 -0700
Subject: [PATCH 072/161] Remove unused parameter (#611)

---
 scripts/test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/test.py b/scripts/test.py
index 2b0134c5fd..48d4a5edf1 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -107,7 +107,7 @@ def hack_emsdk(marker, replacement):
 print('building proper system libraries')
 
 
-def test_lib_building(emcc, use_asmjs_optimizer):
+def test_lib_building(emcc):
   cache_building_messages = ['generating system library: ']
 
   def test_build(args, expected):
@@ -137,7 +137,7 @@ def run_emsdk(cmd):
   check_call([emsdk] + cmd)
 
 
-test_lib_building(upstream_emcc, use_asmjs_optimizer=True)
+test_lib_building(upstream_emcc)
 
 print('update')
 run_emsdk('update-tags')
@@ -146,7 +146,7 @@ def run_emsdk(cmd):
 run_emsdk('install 1.40.1-fastcomp')
 run_emsdk('activate 1.40.1-fastcomp')
 
-test_lib_building(fastcomp_emcc, use_asmjs_optimizer=False)
+test_lib_building(fastcomp_emcc)
 assert open(emconfig).read().count('LLVM_ROOT') == 1
 assert 'upstream' not in open(emconfig).read()
 assert 'fastcomp' in open(emconfig).read()

From f8e0b49c24760068f57e0fc66fed6f2a88bdcf07 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 17 Sep 2020 15:38:54 -0700
Subject: [PATCH 073/161] Clear PYTHONHOME when using bundled python (#600)

Fixes: #598
---
 emsdk           | 28 +++++++++++++++++++++++-----
 emsdk.bat       | 34 +++++++++-------------------------
 emsdk.py        | 19 +++++++++++++++++++
 scripts/test.py |  8 +++++++-
 4 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/emsdk b/emsdk
index eb24599419..777214433b 100755
--- a/emsdk
+++ b/emsdk
@@ -6,13 +6,31 @@
 
 # Wrapper script that runs emsdk.py
 
+# First look for pre-built python (macos)
 if [ -z "$EMSDK_PYTHON" ]; then
-  # Look for python3 first.  This is especially important on macOS (See:
-  # https://github.com/emscripten-core/emsdk/pull/273)
-  EMSDK_PYTHON=$(which python3 2> /dev/null)
-  if [ $? != 0 ]; then
-    EMSDK_PYTHON=python
+  PYTHON3=$(dirname $0)/python/3.7.4-2_64bit/bin/python3
+  if [ -e $PYTHON3 ]; then
+    EMSDK_PYTHON=$PYTHON3
+    # When using our bundled python we never want the users
+    # PYTHONHOME or PYTHONPATH
+    # https://github.com/emscripten-core/emsdk/issues/598
+    unset PYTHONHOME
+    unset PYTHONPATH
   fi
 fi
 
+# Look for `python3` first.  This is especially important on macOS (See:
+# https://github.com/emscripten-core/emsdk/pull/273)
+if [ -z "$EMSDK_PYTHON" ]; then
+  PYTHON3=$(which python3 2> /dev/null)
+  if [ $? = 0 ]; then
+    EMSDK_PYTHON=$PYTHON3
+  fi
+fi
+
+# Finally fall back to just looking for `python` in PATH
+if [ -z "$EMSDK_PYTHON" ]; then
+  EMSDK_PYTHON=python
+fi
+
 exec "$EMSDK_PYTHON" "$0.py" "$@"
diff --git a/emsdk.bat b/emsdk.bat
index c65f23e644..4ba706e944 100644
--- a/emsdk.bat
+++ b/emsdk.bat
@@ -6,41 +6,25 @@ setlocal
 
 if exist "%~dp0python\3.7.4-pywin32_64bit\python.exe" (
   set EMSDK_PY="%~dp0python\3.7.4-pywin32_64bit\python.exe"
+  :: When using our bundled python we never want the users
+  :: PYTHONHOME or PYTHONPATH
+  :: https://github.com/emscripten-core/emsdk/issues/598
+  set PYTHONHOME=
+  set PYTHONPATH=
   goto end
 )
 
 if exist "%~dp0python\3.7.4_64bit\python.exe" (
   set EMSDK_PY="%~dp0python\3.7.4_64bit\python.exe"
+  set PYTHONHOME=
+  set PYTHONPATH=
   goto end
 )
 
 if exist "%~dp0python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe" (
   set EMSDK_PY="%~dp0python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe"
-  goto end
-)
-
-if exist "%~dp0python\2.7.13.1_32bit\python-2.7.13\python.exe" (
-  set EMSDK_PY="%~dp0python\2.7.13.1_32bit\python-2.7.13\python.exe"
-  goto end
-)
-
-if exist "%~dp0python\2.7.5.3_64bit\python.exe" (
-  set EMSDK_PY="%~dp0python\2.7.5.3_64bit\python.exe"
-  goto end
-)
-
-if exist "%~dp0python\2.7.5.3_32bit\python.exe" (
-  set EMSDK_PY="%~dp0python\2.7.5.3_32bit\python.exe"
-  goto end
-)
-
-if exist "%~dp0python\2.7.5_64bit\python.exe" (
-  set EMSDK_PY="%~dp0python\2.7.5_64bit\python.exe"
-  goto end
-)
-
-if exist "%~dp0python\2.7.5.1_32bit\python.exe" (
-  set EMSDK_PY="%~dp0python\2.7.5.1_32bit\python.exe"
+  set PYTHONHOME=
+  set PYTHONPATH=
   goto end
 )
 
diff --git a/emsdk.py b/emsdk.py
index 6570e287de..e4669eecc2 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2575,6 +2575,25 @@ def construct_env(tools_to_activate):
         env_string += 'export ' + key + '="' + value + '";\n'
       else:
         assert False
+      if 'EMSDK_PYTHON' in env_vars:
+        # When using our bundled python we never want the user's
+        # PYTHONHOME or PYTHONPATH
+        # See https://github.com/emscripten-core/emsdk/issues/598
+        if POWERSHELL:
+          env_string += 'Remove-Item env:PYTHONHOME\n'
+          env_string += 'Remove-Item env:PYTHONPATH\n'
+        elif CMD:
+          env_string += 'set PYTHONHOME=\n'
+          env_string += 'set PYTHONPATH=\n'
+        elif CSH:
+          env_string += 'unsetenv PYTHONHOME\n'
+          env_string += 'unsetenv PYTHONPATH\n'
+        elif BASH:
+          env_string += 'unset PYTHONHOME\n'
+          env_string += 'unset PYTHONPATH\n'
+        else:
+          assert False
+
       errlog(key + ' = ' + value)
   return env_string
 
diff --git a/scripts/test.py b/scripts/test.py
index 48d4a5edf1..c38de8309e 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -50,7 +50,13 @@ def check_call(cmd, **args):
 def checked_call_with_output(cmd, expected=None, unexpected=None, stderr=None):
   cmd = cmd.split(' ')
   print('running: %s' % cmd)
-  stdout = subprocess.check_output(cmd, stderr=stderr, universal_newlines=True)
+  try:
+    stdout = subprocess.check_output(cmd, stderr=stderr, universal_newlines=True)
+  except subprocess.CalledProcessError as e:
+    print(e.stderr)
+    print(e.stdout)
+    raise e
+
   if expected:
     for x in listify(expected):
       assert x in stdout, 'call had the right output: ' + stdout + '\n[[[' + x + ']]]'

From 42abe55fd723bb6d493eb68183db747cc4e8cdcf Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 21 Sep 2020 16:59:19 -0700
Subject: [PATCH 074/161] Remove native optimizer build from emscripten master
 install (#622)

This is still used for the legacy emscripten tags installation
but the native optimizer no longer exists on master.

This fixes `emsdk install emscripten-master-64bit`
---
 emsdk_manifest.json | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index b1e59d298e..8b01d57b01 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -395,13 +395,11 @@
     "append_bitness": false,
     "url": "https://github.com/emscripten-core/emscripten.git",
     "git_branch": "master",
-    "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%%generator_prefix%_32bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%'",
+    "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%'",
     "activated_path": "%installation_dir%",
-    "activated_env": "EMSCRIPTEN=%installation_dir%;EMSCRIPTEN_NATIVE_OPTIMIZER=%installation_dir%%generator_prefix%_32bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%",
+    "activated_env": "EMSCRIPTEN=%installation_dir%",
     "cmake_build_type": "Release",
-    "custom_install_script": "emscripten_post_install",
-    "custom_is_installed_script": "is_optimizer_installed",
-    "custom_uninstall_script": "uninstall_optimizer"
+    "custom_install_script": "emscripten_npm_install"
   },
   {
     "id": "emscripten",
@@ -410,13 +408,11 @@
     "append_bitness": false,
     "url": "https://github.com/emscripten-core/emscripten.git",
     "git_branch": "master",
-    "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%%generator_prefix%_64bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%'",
+    "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%'",
     "activated_path": "%installation_dir%",
-    "activated_env": "EMSCRIPTEN=%installation_dir%;EMSCRIPTEN_NATIVE_OPTIMIZER=%installation_dir%%generator_prefix%_64bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%",
+    "activated_env": "EMSCRIPTEN=%installation_dir%",
     "cmake_build_type": "Release",
-    "custom_install_script": "emscripten_post_install",
-    "custom_is_installed_script": "is_optimizer_installed",
-    "custom_uninstall_script": "uninstall_optimizer"
+    "custom_install_script": "emscripten_npm_install"
   },
   {
     "id": "binaryen",

From 7e841b59fce9264b1c93351252defa3797b33b64 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Mon, 28 Sep 2020 15:25:14 -0700
Subject: [PATCH 075/161] 2.0.5 (#625)

---
 bazel/WORKSPACE              | 6 +++---
 emscripten-releases-tags.txt | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index 3ca6586254..dd3b670610 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -8,12 +8,12 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
 
-# emscripten 2.0.4
+# emscripten 2.0.5
 http_archive(
     name = "emscripten",
-    sha256 = "bdce4b6253de29cc779810d8a14d944e439c7670f3befe4550b98a48fd84854c",
+    sha256 = "de447bc94809919157c3f23f888d1248fcbb2e7942e17bc07a3f9bf0a2cd2876",
     strip_prefix = "install",
-    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/eefeb3e623af023844ac477d70d1fd8a668f5110/wasm-binaries.tbz2",
+    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/461f0f118d8d8e6cfd84e077f3eb010c17a39032/wasm-binaries.tbz2",
     build_file = "//emscripten_toolchain:emscripten.BUILD",
     type = "tar.bz2",
 )
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index a0c500d0fb..273e16c49a 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.4",
+  "latest": "2.0.5",
   "releases": {
+    "2.0.5":   "461f0f118d8d8e6cfd84e077f3eb010c17a39032",
     "2.0.4":   "eefeb3e623af023844ac477d70d1fd8a668f5110",
     "2.0.3":   "7a7f38ca19da152d4cd6da4776921a0f1e3f3e3f",
     "2.0.2":   "ede25d889a0abe63360d4c5d420087c8753b8bbe",

From 807e55cbec8fec292045ebcaf547ed7466762d7f Mon Sep 17 00:00:00 2001
From: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
Date: Wed, 30 Sep 2020 00:15:22 -0500
Subject: [PATCH 076/161] Set user environment variables permanently by using
 `--permanent` + deprecate `--global` (#621)

---
 .circleci/config.yml       | 10 ++++++
 README.md                  |  5 ++-
 emsdk.py                   | 65 ++++++++++++++++++++------------------
 scripts/test_permanent.ps1 | 56 ++++++++++++++++++++++++++++++++
 4 files changed, 102 insertions(+), 34 deletions(-)
 mode change 100755 => 100644 emsdk.py
 create mode 100644 scripts/test_permanent.ps1

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8b3959661e..4a2b452584 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -87,6 +87,16 @@ jobs:
           command: |
             source emsdk_env.sh
             python scripts/test.py
+      - run:
+          name: --permanent test
+          shell: powershell.exe
+          command: |
+            try {
+              scripts/test_permanent.ps1
+            } catch {
+              Write-Host "`n Error Message: [$($_.Exception.Message)"] -ForegroundColor Red
+              Write-Host "`n Line Number: "$_.InvocationInfo.ScriptLineNumber -ForegroundColor Red
+            }
 
   build-docker-image:
     executor: bionic
diff --git a/README.md b/README.md
index 1e6fe00401..829b93f99f 100644
--- a/README.md
+++ b/README.md
@@ -176,9 +176,8 @@ reissuing `emsdk install`.
 
 You can toggle between different tools and SDK versions by running `emsdk
 activate <tool/sdk name>`. Activating a tool will set up `~/.emscripten` to
-point to that particular tool. On Windows, you can pass the option `--global` to
-the `activate` command to register the environment permanently to the system
-registry for all users.
+point to that particular tool. On Windows, you can pass the option `--permanent` to
+the `activate` command to register the environment permanently for the current user. Use `--system` to do this for all users.
 
 ### How do I build multiple projects with different SDK versions in parallel?
 
diff --git a/emsdk.py b/emsdk.py
old mode 100755
new mode 100644
index e4669eecc2..5e38497d9e
--- a/emsdk.py
+++ b/emsdk.py
@@ -1760,18 +1760,13 @@ def is_env_active(self):
           return False
     return True
 
-  def win_activate_env_vars(self, permanently_activate):
+  def win_activate_env_vars(self, system):
     if WINDOWS:
       envs = self.activated_environment()
       for env in envs:
         key, value = parse_key_value(env)
 
-        if permanently_activate:
-          # If there is an env var for the LOCAL USER with same name, it will
-          # hide the system var, so must remove that first.
-          win_delete_environment_variable(key, False)
-
-        win_set_environment_variable(key, value, permanently_activate)
+        win_set_environment_variable(key, value, system)
 
   # If this tool can be installed on this system, this function returns True.
   # Otherwise, this function returns a string that describes the reason why this
@@ -2411,7 +2406,7 @@ def write_set_env_script(env_string):
 # Reconfigure .emscripten to choose the currently activated toolset, set PATH
 # and other environment variables.
 # Returns the full list of deduced tools that are now active.
-def set_active_tools(tools_to_activate, permanently_activate):
+def set_active_tools(tools_to_activate, permanently_activate, system):
   tools_to_activate = process_tool_list(tools_to_activate, log_errors=True)
 
   if tools_to_activate:
@@ -2433,13 +2428,13 @@ def set_active_tools(tools_to_activate, permanently_activate):
   if WINDOWS and permanently_activate:
     # Individual env. vars
     for tool in tools_to_activate:
-      tool.win_activate_env_vars(permanently_activate=True)
+      tool.win_activate_env_vars(system=system)
 
     # PATH variable
-    newpath, added_items = adjusted_path(tools_to_activate, system_path_only=True)
+    newpath, added_items = adjusted_path(tools_to_activate, system=system)
     # Are there any actual changes?
     if newpath != os.environ['PATH']:
-      win_set_environment_variable('PATH', newpath, system=True)
+      win_set_environment_variable('PATH', newpath, system=system)
 
   return tools_to_activate
 
@@ -2485,17 +2480,12 @@ def to_msys_path(p):
 
 # Looks at the current PATH and adds and removes entries so that the PATH reflects
 # the set of given active tools.
-def adjusted_path(tools_to_activate, log_additions=False, system_path_only=False):
+def adjusted_path(tools_to_activate, system=False):
   # These directories should be added to PATH
   path_add = get_required_path(tools_to_activate)
   # These already exist.
   if WINDOWS and not MSYS:
-    existing_path = win_get_environment_variable('PATH', system=True)
-    if not system_path_only:
-      current_user_path = win_get_environment_variable('PATH', system=False)
-      if current_user_path:
-        existing_path += ENVPATH_SEPARATOR + current_user_path
-    existing_path = existing_path.split(ENVPATH_SEPARATOR)
+    existing_path = win_get_environment_variable('PATH', system=system).split(ENVPATH_SEPARATOR)
   else:
     existing_path = os.environ['PATH'].split(ENVPATH_SEPARATOR)
   emsdk_root_path = to_unix_path(emsdk_path())
@@ -2737,15 +2727,21 @@ def main():
 
     if WINDOWS:
       print('''
-   emsdk activate [--global] [--build=type] [--vs2017/--vs2019] <tool/sdk>
+   emsdk activate [--permanent] [--system] [--build=type] [--vs2017/--vs2019] <tool/sdk>
 
                                 - Activates the given tool or SDK in the
-                                  environment of the current shell. If the
-                                  --global option is passed, the registration
-                                  is done globally to all users in the system
-                                  environment.  If a custom compiler version was
-                                  used to override the compiler to use, pass
-                                  the same --vs2017/--vs2019 parameter
+                                  environment of the current shell.
+
+                                - If the `--permanent` option is passed, then the environment
+                                  variables are set permanently for the current user.
+
+                                - If the `--system` option is passed, the registration
+                                  is done for all users of the system.
+                                  This needs admin privileges
+                                  (uses Machine environment variables).
+
+                                - If a custom compiler version was used to override
+                                  the compiler to use, pass the same --vs2017/--vs2019 parameter
                                   here to choose which version to activate.
 
    emcmdprompt.bat              - Spawns a new command prompt window with the
@@ -2775,7 +2771,14 @@ def extract_bool_arg(name):
 
   arg_old = extract_bool_arg('--old')
   arg_uses = extract_bool_arg('--uses')
+  arg_permanent = extract_bool_arg('--permanent')
   arg_global = extract_bool_arg('--global')
+  arg_system = extract_bool_arg('--system')
+  if arg_global:
+    print('--global is deprecated. Use `--system` to set the environment variables for all users')
+    arg_system = True
+  if arg_system:
+    arg_permanent = True
   if extract_bool_arg('--embedded'):
     errlog('embedded mode is now the only mode available')
   if extract_bool_arg('--no-embedded'):
@@ -2937,7 +2940,7 @@ def print_tools(t):
     print('Items marked with * are activated for the current user.')
     if has_partially_active_tools[0]:
       env_cmd = 'emsdk_env.bat' if WINDOWS else 'source ./emsdk_env.sh'
-      print('Items marked with (*) are selected for use, but your current shell environment is not configured to use them. Type "' + env_cmd + '" to set up your current shell to use them' + (', or call "emsdk activate --global <name_of_sdk>" to permanently activate them.' if WINDOWS else '.'))
+      print('Items marked with (*) are selected for use, but your current shell environment is not configured to use them. Type "' + env_cmd + '" to set up your current shell to use them' + (', or call "emsdk activate --permanent <name_of_sdk>" to permanently activate them.' if WINDOWS else '.'))
     if not arg_old:
       print('')
       print("To access the historical archived versions, type 'emsdk list --old'")
@@ -2971,8 +2974,8 @@ def print_tools(t):
     fetch_emscripten_tags()
     return 0
   elif cmd == 'activate':
-    if arg_global:
-      print('Registering active Emscripten environment globally for all users.')
+    if arg_permanent:
+      print('Registering active Emscripten environment permanently')
       print('')
 
     tools_to_activate = currently_active_tools()
@@ -2987,12 +2990,12 @@ def print_tools(t):
     if not tools_to_activate:
       errlog('No tools/SDKs specified to activate! Usage:\n   emsdk activate tool/sdk1 [tool/sdk2] [...]')
       return 1
-    active_tools = set_active_tools(tools_to_activate, permanently_activate=arg_global)
+    active_tools = set_active_tools(tools_to_activate, permanently_activate=arg_permanent, system=arg_system)
     if not active_tools:
       errlog('No tools/SDKs found to activate! Usage:\n   emsdk activate tool/sdk1 [tool/sdk2] [...]')
       return 1
-    if WINDOWS and not arg_global:
-      errlog('The changes made to environment variables only apply to the currently running shell instance. Use the \'emsdk_env.bat\' to re-enter this environment later, or if you\'d like to permanently register this environment globally to all users in Windows Registry, rerun this command with the option --global.')
+    if WINDOWS and not arg_permanent:
+      errlog('The changes made to environment variables only apply to the currently running shell instance. Use the \'emsdk_env.bat\' to re-enter this environment later, or if you\'d like to permanently register this environment permanently, rerun this command with the option --permanent.')
     return 0
   elif cmd == 'install':
     # Process args
diff --git a/scripts/test_permanent.ps1 b/scripts/test_permanent.ps1
new file mode 100644
index 0000000000..01ec1f12c1
--- /dev/null
+++ b/scripts/test_permanent.ps1
@@ -0,0 +1,56 @@
+$repo_root = [System.IO.Path]::GetDirectoryName((resolve-path "$PSScriptRoot"))
+
+& "$repo_root/emsdk.ps1" install latest
+& "$repo_root/emsdk.ps1" activate latest --permanent
+
+$EMSDK_USER = [System.Environment]::GetEnvironmentVariable("EMSDK", "User")
+$EM_CONFIG_USER = [System.Environment]::GetEnvironmentVariable("EM_CONFIG", "User")
+$EMSDK_NODE_USER = [System.Environment]::GetEnvironmentVariable("EMSDK_NODE", "User")
+$EMSDK_PYTHON_USER = [System.Environment]::GetEnvironmentVariable("EMSDK_PYTHON", "User")
+$JAVA_HOME_USER = [System.Environment]::GetEnvironmentVariable("JAVA_HOME", "User")
+$EM_CACHE_USER = [System.Environment]::GetEnvironmentVariable("EM_CACHE", "User")
+$PATH_USER = [System.Environment]::GetEnvironmentVariable("PATH", "User")
+
+if (!$EMSDK_USER) {
+    throw "EMSDK is not set for the user"
+}
+if (!$EM_CONFIG_USER) {
+    throw "EM_CONFIG_USER is not set for the user"
+}
+if (!$EMSDK_NODE_USER) {
+    throw "EMSDK_NODE is not set for the user"
+}
+if (!$JAVA_HOME_USER) {
+    throw "JAVA_HOME is not set for the user"
+}
+if (!$EMSDK_PYTHON_USER) {
+    throw "EMSDK_PYTHON is not set for the user"
+}
+if (!$EM_CACHE_USER) {
+    throw "EM_CACHE is not set for the user"
+}
+
+
+$path_split = $PATH_USER.Split(';')
+
+$EMSDK_Path_USER = $path_split | Where-Object { $_ -match 'emsdk' }
+if (!$EMSDK_Path_USER) {
+    throw "No path is added!"
+}
+$EMSDK_NODE_Path_USER = $path_split | Where-Object { $_ -match 'emsdk\\node' }
+if (!$EMSDK_NODE_Path_USER) {
+    throw "emsdk\node is not added to path."
+}
+$EMSDK_PYTHON_Path_USER = $path_split | Where-Object { $_ -match 'emsdk\\python' }
+if (!$EMSDK_PYTHON_Path_USER) {
+    throw "emsdk\python is not added to path."
+}
+$EMSDK_JAVA_Path_USER = $path_split | Where-Object { $_ -match 'emsdk\\java' }
+if (!$EMSDK_JAVA_Path_USER) {
+    throw "emsdk\java is not added to path."
+}
+
+$EMSDK_UPSTREAM_Path_USER = $path_split | Where-Object { $_ -match 'emsdk\\upstream\\emscripten' }
+if (!$EMSDK_UPSTREAM_Path_USER) {
+    throw "emsdk\upstream\emscripten is not added to path."
+}

From 8ca8591e2b68e8c3968347e1f75ecdc49a3a9c97 Mon Sep 17 00:00:00 2001
From: Chris Savoie <chris@chrissavoie.com>
Date: Wed, 30 Sep 2020 15:24:37 -0700
Subject: [PATCH 077/161] Fix ``The system cannot find the drive specified.``
 due to ``::`` style comments used in function block in emsdk.bat (#627)

---
 emsdk.bat | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/emsdk.bat b/emsdk.bat
index 4ba706e944..66f6d11791 100644
--- a/emsdk.bat
+++ b/emsdk.bat
@@ -4,11 +4,11 @@
 
 setlocal
 
+:: When using our bundled python we never want the users
+:: PYTHONHOME or PYTHONPATH
+:: https://github.com/emscripten-core/emsdk/issues/598
 if exist "%~dp0python\3.7.4-pywin32_64bit\python.exe" (
   set EMSDK_PY="%~dp0python\3.7.4-pywin32_64bit\python.exe"
-  :: When using our bundled python we never want the users
-  :: PYTHONHOME or PYTHONPATH
-  :: https://github.com/emscripten-core/emsdk/issues/598
   set PYTHONHOME=
   set PYTHONPATH=
   goto end

From e899a6fd5afab39de6d3947d52ed60fa6ed225ad Mon Sep 17 00:00:00 2001
From: "M.T. McParlane" <1326577+mmcparlane@users.noreply.github.com>
Date: Thu, 1 Oct 2020 15:32:16 -0400
Subject: [PATCH 078/161] Fix issue where MSYS2 and MinGW mistaken for Linux
 (#628)

When running `emsdk.py` with python provided by MSYS2/MinGW the environment gets falsely identified as Linux.

See discussion for details:
https://github.com/emscripten-core/emscripten/issues/12376#issuecomment-702245993

Fixes #385
---
 emsdk.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index 5e38497d9e..eb2686c01a 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -74,7 +74,7 @@ def errlog(msg):
   MACOS = True
 
 LINUX = False
-if not MACOS and (platform.system() == 'Linux' or os.name == 'posix'):
+if not MACOS and (platform.system() == 'Linux'):
   LINUX = True
 
 UNIX = (MACOS or LINUX)

From aec1e16f518517ab140a25f59af0840ae754c86c Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Fri, 2 Oct 2020 15:16:44 -0700
Subject: [PATCH 079/161] 2.0.6 (#629)

---
 bazel/WORKSPACE              | 6 +++---
 emscripten-releases-tags.txt | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index dd3b670610..381611dc37 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -8,12 +8,12 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
 
-# emscripten 2.0.5
+# emscripten 2.0.6
 http_archive(
     name = "emscripten",
-    sha256 = "de447bc94809919157c3f23f888d1248fcbb2e7942e17bc07a3f9bf0a2cd2876",
+    sha256 = "4ce4a10cb32d0f7a40f49579f1d29a261f18bb990b92c0cec6a165581da2fc38",
     strip_prefix = "install",
-    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/461f0f118d8d8e6cfd84e077f3eb010c17a39032/wasm-binaries.tbz2",
+    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/4ba921c8c8fe2e8cae071ca9889d5c27f5debd87/wasm-binaries.tbz2",
     build_file = "//emscripten_toolchain:emscripten.BUILD",
     type = "tar.bz2",
 )
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 273e16c49a..6bb100b848 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.5",
+  "latest": "2.0.6",
   "releases": {
+    "2.0.6":   "4ba921c8c8fe2e8cae071ca9889d5c27f5debd87",
     "2.0.5":   "461f0f118d8d8e6cfd84e077f3eb010c17a39032",
     "2.0.4":   "eefeb3e623af023844ac477d70d1fd8a668f5110",
     "2.0.3":   "7a7f38ca19da152d4cd6da4776921a0f1e3f3e3f",

From 47b7f850f2196ad84c346da1cfbb68081063de1b Mon Sep 17 00:00:00 2001
From: Dannii Willis <curiousdannii@gmail.com>
Date: Tue, 6 Oct 2020 11:12:56 +1000
Subject: [PATCH 080/161] Skip installing optional npm deps, but manually
 install Closure Compiler native package (#630)

Follow on to https://github.com/emscripten-core/emsdk/pull/625
Fixes https://github.com/emscripten-core/emscripten/issues/12406
---
 emsdk.py | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index eb2686c01a..bf6319c267 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -1241,13 +1241,41 @@ def emscripten_npm_install(tool, directory):
   print('Running post-install step: npm ci ...')
   try:
     subprocess.check_output(
-        [npm, 'ci', '--production'],
+        [npm, 'ci', '--production', '--no-optional'],
         cwd=directory, stderr=subprocess.STDOUT, env=env,
         universal_newlines=True)
   except subprocess.CalledProcessError as e:
     print('Error running %s:\n%s' % (e.cmd, e.output))
     return False
 
+  # Manually install the appropriate native Closure Compiler package
+  # This is currently needed because npm ci will install the packages
+  # for Closure for all platforms, adding 180MB to the download size
+  # There are two problems here:
+  #   1. npm ci does not consider the platform of optional dependencies
+  #      https://github.com/npm/cli/issues/558
+  #   2. A bug with the native compiler has bloated the packages from
+  #      30MB to almost 300MB
+  #      https://github.com/google/closure-compiler-npm/issues/186
+  # If either of these bugs are fixed then we can remove this exception
+  closure_compiler_native = ''
+  if LINUX:
+    closure_compiler_native = 'google-closure-compiler-linux'
+  if MACOS:
+    closure_compiler_native = 'google-closure-compiler-osx'
+  if WINDOWS:
+    closure_compiler_native = 'google-closure-compiler-windows'
+  if closure_compiler_native:
+    print('Running post-install step: npm install', closure_compiler_native)
+    try:
+      subprocess.check_output(
+        [npm, 'install', closure_compiler_native],
+        cwd=directory, stderr=subprocess.STDOUT, env=env,
+        universal_newlines=True)
+    except subprocess.CalledProcessError as e:
+      print('Error running %s:\n%s' % (e.cmd, e.output))
+      return False
+
   print('Done running: npm ci')
   return True
 

From 31f5f842ff4c8d22e939fe0c8c27b34d9c9c0184 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Tue, 6 Oct 2020 07:42:46 -0700
Subject: [PATCH 081/161] Revert "Skip installing optional npm deps, but
 manually install Closure Compiler native package (#630)" (#633)

This reverts commit 47b7f850f2196ad84c346da1cfbb68081063de1b.

Fixes #632
---
 emsdk.py | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index bf6319c267..eb2686c01a 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -1241,41 +1241,13 @@ def emscripten_npm_install(tool, directory):
   print('Running post-install step: npm ci ...')
   try:
     subprocess.check_output(
-        [npm, 'ci', '--production', '--no-optional'],
+        [npm, 'ci', '--production'],
         cwd=directory, stderr=subprocess.STDOUT, env=env,
         universal_newlines=True)
   except subprocess.CalledProcessError as e:
     print('Error running %s:\n%s' % (e.cmd, e.output))
     return False
 
-  # Manually install the appropriate native Closure Compiler package
-  # This is currently needed because npm ci will install the packages
-  # for Closure for all platforms, adding 180MB to the download size
-  # There are two problems here:
-  #   1. npm ci does not consider the platform of optional dependencies
-  #      https://github.com/npm/cli/issues/558
-  #   2. A bug with the native compiler has bloated the packages from
-  #      30MB to almost 300MB
-  #      https://github.com/google/closure-compiler-npm/issues/186
-  # If either of these bugs are fixed then we can remove this exception
-  closure_compiler_native = ''
-  if LINUX:
-    closure_compiler_native = 'google-closure-compiler-linux'
-  if MACOS:
-    closure_compiler_native = 'google-closure-compiler-osx'
-  if WINDOWS:
-    closure_compiler_native = 'google-closure-compiler-windows'
-  if closure_compiler_native:
-    print('Running post-install step: npm install', closure_compiler_native)
-    try:
-      subprocess.check_output(
-        [npm, 'install', closure_compiler_native],
-        cwd=directory, stderr=subprocess.STDOUT, env=env,
-        universal_newlines=True)
-    except subprocess.CalledProcessError as e:
-      print('Error running %s:\n%s' % (e.cmd, e.output))
-      return False
-
   print('Done running: npm ci')
   return True
 

From 53c184e8d3b82c2cc9c03dc8aeffe623dd29b4a9 Mon Sep 17 00:00:00 2001
From: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
Date: Wed, 7 Oct 2020 10:01:03 -0500
Subject: [PATCH 082/161] Avoid pywin32 dependency on Windows (#635)

Instead use winreg/_winreg for the registry and ctypes for the
SendMessage call
---
 emsdk.py | 73 ++++++++++++++++----------------------------------------
 1 file changed, 20 insertions(+), 53 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index eb2686c01a..39637b93fc 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -21,6 +21,13 @@
 import sys
 import sysconfig
 import zipfile
+if os.name == 'nt':
+  try:
+    import winreg
+  except ImportError:
+    # old python 2 name
+    import _winreg as winreg
+  import ctypes.wintypes
 
 if sys.version_info >= (3,):
   from urllib.parse import urljoin
@@ -291,31 +298,15 @@ def remove_readonly_and_try_again(func, path, exc_info):
     debug_print('remove_tree threw an exception, ignoring: ' + str(e))
 
 
-def import_pywin32():
-  if WINDOWS:
-    try:
-      import win32api
-      import win32con
-      return win32api, win32con
-    except Exception:
-      exit_with_error('Failed to import Python Windows extensions win32api and win32con. Make sure you are using the version of python available in emsdk, or install PyWin extensions to the distribution of Python you are attempting to use. (This script was launched in python instance from "' + sys.executable + '")')
-
-
 def win_set_environment_variable_direct(key, value, system=True):
-  prev_path = os.environ['PATH']
   try:
-    py = find_used_python()
-    if py:
-      py_path = to_native_path(py.expand_vars(py.activated_path))
-      os.environ['PATH'] = os.environ['PATH'] + ';' + py_path
-    win32api, win32con = import_pywin32()
     if system:
       # Read globally from ALL USERS section.
-      folder = win32api.RegOpenKeyEx(win32con.HKEY_LOCAL_MACHINE, 'SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment', 0, win32con.KEY_ALL_ACCESS)
+      folder = winreg.OpenKeyEx(winreg.HKEY_LOCAL_MACHINE, 'SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment', 0, winreg.KEY_ALL_ACCESS)
     else:
       # Register locally from CURRENT USER section.
-      folder = win32api.RegOpenKeyEx(win32con.HKEY_CURRENT_USER, 'Environment', 0, win32con.KEY_ALL_ACCESS)
-    win32api.RegSetValueEx(folder, key, 0, win32con.REG_EXPAND_SZ, value)
+      folder = winreg.OpenKeyEx(winreg.HKEY_CURRENT_USER, 'Environment', 0, winreg.KEY_ALL_ACCESS)
+    winreg.SetValueEx(folder, key, 0, winreg.REG_EXPAND_SZ, value)
     debug_print('Set key=' + key + ' with value ' + value + ' in registry.')
   except Exception as e:
     # 'Access is denied.'
@@ -323,32 +314,25 @@ def win_set_environment_variable_direct(key, value, system=True):
       exit_with_error('Error! Failed to set the environment variable \'' + key + '\'! Setting environment variables permanently requires administrator access. Please rerun this command with administrative privileges. This can be done for example by holding down the Ctrl and Shift keys while opening a command prompt in start menu.')
     errlog('Failed to write environment variable ' + key + ':')
     errlog(str(e))
-    win32api.RegCloseKey(folder)
-    os.environ['PATH'] = prev_path
+    folder.Close()
     return None
 
-  win32api.RegCloseKey(folder)
-  os.environ['PATH'] = prev_path
-  win32api.PostMessage(win32con.HWND_BROADCAST, win32con.WM_SETTINGCHANGE, 0, 'Environment')
+  folder.Close()
+  HWND_BROADCAST = ctypes.wintypes.HWND(0xFFFF)  # win32con.HWND_BROADCAST == 65535
+  WM_SETTINGCHANGE = 0x001A  # win32con.WM_SETTINGCHANGE == 26
+  ctypes.windll.user32.SendMessageA(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 'Environment')
 
 
 def win_get_environment_variable(key, system=True):
-  prev_path = os.environ['PATH']
   try:
-    py = find_used_python()
-    if py:
-      py_path = to_native_path(py.expand_vars(py.activated_path))
-      os.environ['PATH'] = os.environ['PATH'] + ';' + py_path
     try:
-      import win32api
-      import win32con
       if system:
         # Read globally from ALL USERS section.
-        folder = win32api.RegOpenKey(win32con.HKEY_LOCAL_MACHINE, 'SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment')
+        folder = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, 'SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment')
       else:
         # Register locally from CURRENT USER section.
-        folder = win32api.RegOpenKey(win32con.HKEY_CURRENT_USER, 'Environment')
-      value = str(win32api.RegQueryValueEx(folder, key)[0])
+        folder = winreg.OpenKey(winreg.HKEY_CURRENT_USER, 'Environment')
+      value = str(winreg.QueryValueEx(folder, key)[0])
     except Exception:
       # PyWin32 is not available - read via os.environ. This has the drawback
       # that expansion items such as %PROGRAMFILES% will have been expanded, so
@@ -361,13 +345,11 @@ def win_get_environment_variable(key, system=True):
       errlog('Failed to read environment variable ' + key + ':')
       errlog(str(e))
     try:
-      win32api.RegCloseKey(folder)
+      folder.Close()
     except Exception:
       pass
-    os.environ['PATH'] = prev_path
     return None
-  win32api.RegCloseKey(folder)
-  os.environ['PATH'] = prev_path
+  folder.Close()
   return value
 
 
@@ -2058,21 +2040,6 @@ def get_release_hash(arg, releases_info):
   return releases_info.get(arg, None) or releases_info.get('sdk-' + arg + '-64bit')
 
 
-# Finds the best-matching python tool for use.
-def find_used_python():
-  # Find newest tool first - those are always at the end of the list.
-  for t in reversed(tools):
-    if t.id == 'python' and t.is_installed() and t.is_active() and t.is_env_active():
-      return t
-  for t in reversed(tools):
-    if t.id == 'python' and t.is_installed() and t.is_active():
-      return t
-  for t in reversed(tools):
-    if t.id == 'python' and t.is_installed():
-      return t
-  return None
-
-
 def version_key(ver):
   return tuple(map(int, re.split('[._-]', ver)))
 

From 107dc62dd7fa90324d01658e6bcb514eca02d00a Mon Sep 17 00:00:00 2001
From: Dannii Willis <curiousdannii@gmail.com>
Date: Fri, 9 Oct 2020 11:28:43 +1000
Subject: [PATCH 083/161] Skip installing optional npm deps, but manually
 install Closure Compiler native package (#636)

Follow on to #625, #630, #632, #633
Fixes emscripten-core/emscripten#12406
---
 emsdk.py | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index 39637b93fc..ee5452d1b9 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -1223,13 +1223,41 @@ def emscripten_npm_install(tool, directory):
   print('Running post-install step: npm ci ...')
   try:
     subprocess.check_output(
-        [npm, 'ci', '--production'],
+        [npm, 'ci', '--production', '--no-optional'],
         cwd=directory, stderr=subprocess.STDOUT, env=env,
         universal_newlines=True)
   except subprocess.CalledProcessError as e:
     print('Error running %s:\n%s' % (e.cmd, e.output))
     return False
 
+  # Manually install the appropriate native Closure Compiler package
+  # This is currently needed because npm ci will install the packages
+  # for Closure for all platforms, adding 180MB to the download size
+  # There are two problems here:
+  #   1. npm ci does not consider the platform of optional dependencies
+  #      https://github.com/npm/cli/issues/558
+  #   2. A bug with the native compiler has bloated the packages from
+  #      30MB to almost 300MB
+  #      https://github.com/google/closure-compiler-npm/issues/186
+  # If either of these bugs are fixed then we can remove this exception
+  closure_compiler_native = ''
+  if LINUX and ARCH in ('x86', 'x86_64'):
+    closure_compiler_native = 'google-closure-compiler-linux'
+  if MACOS and ARCH in ('x86', 'x86_64'):
+    closure_compiler_native = 'google-closure-compiler-osx'
+  if WINDOWS and ARCH == 'x86_64':
+    closure_compiler_native = 'google-closure-compiler-windows'
+  if closure_compiler_native:
+    print('Running post-install step: npm install', closure_compiler_native)
+    try:
+      subprocess.check_output(
+        [npm, 'install', closure_compiler_native],
+        cwd=directory, stderr=subprocess.STDOUT, env=env,
+        universal_newlines=True)
+    except subprocess.CalledProcessError as e:
+      print('Error running %s:\n%s' % (e.cmd, e.output))
+      return False
+
   print('Done running: npm ci')
   return True
 

From 4fe6e492c0a409e1070a5684e3de06d76baebd71 Mon Sep 17 00:00:00 2001
From: Chris Savoie <chris@chrissavoie.com>
Date: Fri, 9 Oct 2020 12:58:59 -0700
Subject: [PATCH 084/161] Fix environment variables to be consistently set when
 using --system or --permanent (#515)

Also switch PostMessage to SendMessageWithTimeout and only send one if
environment variables actually changed.

Also, enable and fix --permanent unit tests.
---
 .circleci/config.yml       |   7 +-
 emsdk.py                   | 180 +++++++++++++++++++++----------------
 scripts/test_permanent.ps1 |  18 ++--
 3 files changed, 113 insertions(+), 92 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4a2b452584..6a5e16f475 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -91,12 +91,7 @@ jobs:
           name: --permanent test
           shell: powershell.exe
           command: |
-            try {
-              scripts/test_permanent.ps1
-            } catch {
-              Write-Host "`n Error Message: [$($_.Exception.Message)"] -ForegroundColor Red
-              Write-Host "`n Line Number: "$_.InvocationInfo.ScriptLineNumber -ForegroundColor Red
-            }
+            scripts/test_permanent.ps1
 
   build-docker-image:
     executor: bionic
diff --git a/emsdk.py b/emsdk.py
index ee5452d1b9..503224444d 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -299,6 +299,7 @@ def remove_readonly_and_try_again(func, path, exc_info):
 
 
 def win_set_environment_variable_direct(key, value, system=True):
+  folder = None
   try:
     if system:
       # Read globally from ALL USERS section.
@@ -308,23 +309,22 @@ def win_set_environment_variable_direct(key, value, system=True):
       folder = winreg.OpenKeyEx(winreg.HKEY_CURRENT_USER, 'Environment', 0, winreg.KEY_ALL_ACCESS)
     winreg.SetValueEx(folder, key, 0, winreg.REG_EXPAND_SZ, value)
     debug_print('Set key=' + key + ' with value ' + value + ' in registry.')
+    return True
   except Exception as e:
     # 'Access is denied.'
-    if e.args[0] == 5:
+    if e.args[3] == 5:
       exit_with_error('Error! Failed to set the environment variable \'' + key + '\'! Setting environment variables permanently requires administrator access. Please rerun this command with administrative privileges. This can be done for example by holding down the Ctrl and Shift keys while opening a command prompt in start menu.')
     errlog('Failed to write environment variable ' + key + ':')
     errlog(str(e))
-    folder.Close()
-    return None
-
-  folder.Close()
-  HWND_BROADCAST = ctypes.wintypes.HWND(0xFFFF)  # win32con.HWND_BROADCAST == 65535
-  WM_SETTINGCHANGE = 0x001A  # win32con.WM_SETTINGCHANGE == 26
-  ctypes.windll.user32.SendMessageA(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 'Environment')
+    return False
+  finally:
+    if folder is not None:
+      folder.Close()
 
 
-def win_get_environment_variable(key, system=True):
+def win_get_environment_variable(key, system=True, fallback=True):
   try:
+    folder = None
     try:
       if system:
         # Read globally from ALL USERS section.
@@ -334,22 +334,24 @@ def win_get_environment_variable(key, system=True):
         folder = winreg.OpenKey(winreg.HKEY_CURRENT_USER, 'Environment')
       value = str(winreg.QueryValueEx(folder, key)[0])
     except Exception:
-      # PyWin32 is not available - read via os.environ. This has the drawback
+      # If reading registry fails for some reason - read via os.environ. This has the drawback
       # that expansion items such as %PROGRAMFILES% will have been expanded, so
       # need to be precise not to set these back to system registry, or
       # expansion items would be lost.
-      return os.environ[key]
+      if fallback:
+        return os.environ[key]
+      return None
+    finally:
+      if folder is not None:
+        folder.Close()
+
   except Exception as e:
+    # this catch is if both the registry key threw an exception and the key is not in os.environ
     if e.args[0] != 2:
       # 'The system cannot find the file specified.'
       errlog('Failed to read environment variable ' + key + ':')
       errlog(str(e))
-    try:
-      folder.Close()
-    except Exception:
-      pass
     return None
-  folder.Close()
   return value
 
 
@@ -367,11 +369,11 @@ def win_get_active_environment_variable(key):
 
 def win_set_environment_variable(key, value, system=True):
   debug_print('set ' + str(key) + '=' + str(value) + ', in system=' + str(system), file=sys.stderr)
-  previous_value = win_get_environment_variable(key, system)
+  previous_value = win_get_environment_variable(key, system, fallback=False)
   if previous_value == value:
     debug_print('  no need to set, since same value already exists.')
     # No need to elevate UAC for nothing to set the same value, skip.
-    return
+    return False
 
   if not value:
     try:
@@ -382,13 +384,12 @@ def win_set_environment_variable(key, value, system=True):
       debug_print(str(cmd))
       value = subprocess.call(cmd, stdout=subprocess.PIPE)
     except Exception:
-      return
-    return
+      return False
+    return True
 
   try:
-    if system:
-      win_set_environment_variable_direct(key, value, system)
-      return
+    if win_set_environment_variable_direct(key, value, system):
+      return True
     # Escape % signs so that we don't expand references to environment variables.
     value = value.replace('%', '^%')
     if len(value) >= 1024:
@@ -398,15 +399,53 @@ def win_set_environment_variable(key, value, system=True):
     retcode = subprocess.call(cmd, stdout=subprocess.PIPE)
     if retcode != 0:
       errlog('ERROR! Failed to set environment variable ' + key + '=' + value + '. You may need to set it manually.')
+    else:
+      return True
   except Exception as e:
     errlog('ERROR! Failed to set environment variable ' + key + '=' + value + ':')
     errlog(str(e))
     errlog('You may need to set it manually.')
 
+  return False
+
+
+def win_set_environment_variables(env_vars_to_add, system):
+  if not env_vars_to_add:
+    return
+
+  changed = False
+
+  for key, value in env_vars_to_add:
+    if win_set_environment_variable(key, value, system):
+      if not changed:
+        changed = True
+        print('Setting global environment variables:')
+
+      print(key + ' = ' + value)
+
+  if not changed:
+    print('Global environment variables up to date')
+    return
+
+  # if changes were made then we need to notify other processes
+  try:
+    HWND_BROADCAST = ctypes.wintypes.HWND(0xFFFF)  # win32con.HWND_BROADCAST == 65535
+    WM_SETTINGCHANGE = 0x001A  # win32con.WM_SETTINGCHANGE == 26
+    SMTO_BLOCK = 0x0001  # win32con.SMTO_BLOCK == 1
+    ctypes.windll.user32.SendMessageTimeoutA(
+      HWND_BROADCAST,    # hWnd: notify everyone
+      WM_SETTINGCHANGE,  # Msg: registry changed
+      0,                 # wParam: Must be 0 when setting changed is sent by users
+      'Environment',     # lParam: Specifically environment variables changed
+      SMTO_BLOCK,        # fuFlags: Wait for message to be sent or timeout
+      100)               # uTimeout: 100ms
+  except Exception as e:
+    errlog('SendMessageTimeout failed with error: ' + str(e))
+
 
 def win_delete_environment_variable(key, system=True):
   debug_print('win_delete_environment_variable(key=' + key + ', system=' + str(system) + ')')
-  win_set_environment_variable(key, None, system)
+  return win_set_environment_variable(key, None, system)
 
 
 # Returns the absolute pathname to the given path inside the Emscripten SDK.
@@ -1770,14 +1809,6 @@ def is_env_active(self):
           return False
     return True
 
-  def win_activate_env_vars(self, system):
-    if WINDOWS:
-      envs = self.activated_environment()
-      for env in envs:
-        key, value = parse_key_value(env)
-
-        win_set_environment_variable(key, value, system)
-
   # If this tool can be installed on this system, this function returns True.
   # Otherwise, this function returns a string that describes the reason why this
   # tool is not available.
@@ -2416,20 +2447,14 @@ def set_active_tools(tools_to_activate, permanently_activate, system):
   # calling shell environment.  On other platform `source emsdk_env.sh` is
   # required.
   if WINDOWS:
-    env_string = construct_env(tools_to_activate)
+    # always set local environment variables since permanently activating will only set the registry settings and
+    # will not affect the current session
+    env_vars_to_add = get_env_vars_to_add(tools_to_activate)
+    env_string = construct_env_with_vars(env_vars_to_add)
     write_set_env_script(env_string)
 
-  # Apply environment variables to global all users section.
-  if WINDOWS and permanently_activate:
-    # Individual env. vars
-    for tool in tools_to_activate:
-      tool.win_activate_env_vars(system=system)
-
-    # PATH variable
-    newpath, added_items = adjusted_path(tools_to_activate, system=system)
-    # Are there any actual changes?
-    if newpath != os.environ['PATH']:
-      win_set_environment_variable('PATH', newpath, system=system)
+    if permanently_activate:
+      win_set_environment_variables(env_vars_to_add, system)
 
   return tools_to_activate
 
@@ -2504,22 +2529,14 @@ def adjusted_path(tools_to_activate, system=False):
   return (separator.join(whole_path), new_emsdk_tools)
 
 
-def construct_env(tools_to_activate):
-  env_string = ''
+def get_env_vars_to_add(tools_to_activate):
+  env_vars_to_add = []
+
   newpath, added_path = adjusted_path(tools_to_activate)
 
   # Don't bother setting the path if there are no changes.
   if os.environ['PATH'] != newpath:
-    if POWERSHELL:
-      env_string += '$env:PATH="' + newpath + '"\n'
-    elif CMD:
-      env_string += 'SET PATH=' + newpath + '\n'
-    elif CSH:
-      env_string += 'setenv PATH "' + newpath + '";\n'
-    elif BASH:
-      env_string += 'export PATH="' + newpath + '";\n'
-    else:
-      assert False
+    env_vars_to_add += [('PATH', newpath)]
 
     if added_path:
       errlog('Adding directories to PATH:')
@@ -2528,11 +2545,8 @@ def construct_env(tools_to_activate):
       errlog('')
 
   # A core variable EMSDK points to the root of Emscripten SDK directory.
-  env_vars = [('EMSDK', to_unix_path(emsdk_path()))]
-
-  em_config_path = os.path.normpath(dot_emscripten_path())
-  if to_unix_path(os.environ.get('EM_CONFIG', '')) != to_unix_path(em_config_path):
-    env_vars += [('EM_CONFIG', em_config_path)]
+  env_vars_to_add += [('EMSDK', to_unix_path(emsdk_path()))]
+  env_vars_to_add += [('EM_CONFIG', os.path.normpath(dot_emscripten_path()))]
 
   for tool in tools_to_activate:
     config = tool.activated_config()
@@ -2540,27 +2554,40 @@ def construct_env(tools_to_activate):
       # For older emscripten versions that don't use this default we export
       # EM_CACHE.
       em_cache_dir = os.path.join(config['EMSCRIPTEN_ROOT'], 'cache')
-      env_vars += [('EM_CACHE', em_cache_dir)]
+      env_vars_to_add += [('EM_CACHE', em_cache_dir)]
     envs = tool.activated_environment()
     for env in envs:
       key, value = parse_key_value(env)
       value = to_native_path(tool.expand_vars(value))
-      env_vars += [(key, value)]
+      env_vars_to_add += [(key, value)]
 
-  if env_vars:
+  return env_vars_to_add
+
+
+def construct_env(tools_to_activate):
+  return construct_env_with_vars(get_env_vars_to_add(tools_to_activate))
+
+
+def construct_env_with_vars(env_vars_to_add):
+  env_string = ''
+  if env_vars_to_add:
     errlog('Setting environment variables:')
-    for key, value in env_vars:
-      if POWERSHELL:
-        env_string += '$env:' + key + '="' + value + '"\n'
-      elif CMD:
-        env_string += 'SET ' + key + '=' + value + '\n'
-      elif CSH:
-        env_string += 'setenv ' + key + ' "' + value + '";\n'
-      elif BASH:
-        env_string += 'export ' + key + '="' + value + '";\n'
-      else:
-        assert False
-      if 'EMSDK_PYTHON' in env_vars:
+
+    for key, value in env_vars_to_add:
+      # Don't set env vars which are already set to the correct value.
+      if key not in os.environ or to_unix_path(os.environ[key]) != to_unix_path(value):
+        errlog(key + ' = ' + value)
+        if POWERSHELL:
+          env_string += '$env:' + key + '="' + value + '"\n'
+        elif CMD:
+          env_string += 'SET ' + key + '=' + value + '\n'
+        elif CSH:
+          env_string += 'setenv ' + key + ' "' + value + '"\n'
+        elif BASH:
+          env_string += 'export ' + key + '="' + value + '"\n'
+        else:
+          assert False
+      if 'EMSDK_PYTHON' in env_vars_to_add:
         # When using our bundled python we never want the user's
         # PYTHONHOME or PYTHONPATH
         # See https://github.com/emscripten-core/emsdk/issues/598
@@ -2579,7 +2606,6 @@ def construct_env(tools_to_activate):
         else:
           assert False
 
-      errlog(key + ' = ' + value)
   return env_string
 
 
diff --git a/scripts/test_permanent.ps1 b/scripts/test_permanent.ps1
index 01ec1f12c1..4c9da198bf 100644
--- a/scripts/test_permanent.ps1
+++ b/scripts/test_permanent.ps1
@@ -33,24 +33,24 @@ if (!$EM_CACHE_USER) {
 
 $path_split = $PATH_USER.Split(';')
 
-$EMSDK_Path_USER = $path_split | Where-Object { $_ -match 'emsdk' }
+$EMSDK_Path_USER = $path_split | Where-Object { $_ -like "$repo_root*" }
 if (!$EMSDK_Path_USER) {
     throw "No path is added!"
 }
-$EMSDK_NODE_Path_USER = $path_split | Where-Object { $_ -match 'emsdk\\node' }
+$EMSDK_NODE_Path_USER = $path_split | Where-Object { $_ -like "$repo_root\node*" }
 if (!$EMSDK_NODE_Path_USER) {
-    throw "emsdk\node is not added to path."
+    throw "$repo_root\\node is not added to path."
 }
-$EMSDK_PYTHON_Path_USER = $path_split | Where-Object { $_ -match 'emsdk\\python' }
+$EMSDK_PYTHON_Path_USER = $path_split | Where-Object { $_ -like "$repo_root\python*" }
 if (!$EMSDK_PYTHON_Path_USER) {
-    throw "emsdk\python is not added to path."
+    throw "$repo_root\\python is not added to path."
 }
-$EMSDK_JAVA_Path_USER = $path_split | Where-Object { $_ -match 'emsdk\\java' }
+$EMSDK_JAVA_Path_USER = $path_split | Where-Object { $_ -like "$repo_root\java*" }
 if (!$EMSDK_JAVA_Path_USER) {
-    throw "emsdk\java is not added to path."
+    throw "$repo_root\\java is not added to path."
 }
 
-$EMSDK_UPSTREAM_Path_USER = $path_split | Where-Object { $_ -match 'emsdk\\upstream\\emscripten' }
+$EMSDK_UPSTREAM_Path_USER = $path_split | Where-Object { $_ -like "$repo_root\upstream\emscripten*" }
 if (!$EMSDK_UPSTREAM_Path_USER) {
-    throw "emsdk\upstream\emscripten is not added to path."
+    throw "$repo_root\\upstream\emscripten is not added to path."
 }

From da9419f42ad3ed112adedbb830ef5140f92af4b6 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Tue, 13 Oct 2020 06:51:20 -0700
Subject: [PATCH 085/161] 2.0.7 (#641)

---
 bazel/WORKSPACE              | 6 +++---
 emscripten-releases-tags.txt | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index 381611dc37..d422c1065d 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -8,12 +8,12 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
 
-# emscripten 2.0.6
+# emscripten 2.0.7
 http_archive(
     name = "emscripten",
-    sha256 = "4ce4a10cb32d0f7a40f49579f1d29a261f18bb990b92c0cec6a165581da2fc38",
+    sha256 = "e56accd855a397518caa793760f04c43a53e21e8f000a30b568eceec0c6713bc",
     strip_prefix = "install",
-    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/4ba921c8c8fe2e8cae071ca9889d5c27f5debd87/wasm-binaries.tbz2",
+    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/d7a29d82b320e471203b69d43aaf03b560eedc54/wasm-binaries.tbz2",
     build_file = "//emscripten_toolchain:emscripten.BUILD",
     type = "tar.bz2",
 )
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 6bb100b848..c262e196ad 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.6",
+  "latest": "2.0.7",
   "releases": {
+    "2.0.7":   "d7a29d82b320e471203b69d43aaf03b560eedc54",
     "2.0.6":   "4ba921c8c8fe2e8cae071ca9889d5c27f5debd87",
     "2.0.5":   "461f0f118d8d8e6cfd84e077f3eb010c17a39032",
     "2.0.4":   "eefeb3e623af023844ac477d70d1fd8a668f5110",

From 10290f2f1d0f4a1e6f6a6dce6c472e948d276f54 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Sat, 24 Oct 2020 10:01:10 -0700
Subject: [PATCH 086/161] Update mac circleci environment (#644)

Apparently `Image xcode:9.0 is not supported` these days.
---
 .circleci/config.yml | 2 +-
 emsdk                | 6 ++++++
 emsdk_manifest.json  | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6a5e16f475..5d2a1f5acf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,7 +44,7 @@ jobs:
             scripts/test.py
   test-mac:
     macos:
-      xcode: "9.0"
+      xcode: "12.2.0"
     environment:
       EMSDK_NOTTY: "1"
       # Without this, any `brew installl` command will result in self-update of
diff --git a/emsdk b/emsdk
index 777214433b..f728f1308b 100755
--- a/emsdk
+++ b/emsdk
@@ -11,11 +11,17 @@ if [ -z "$EMSDK_PYTHON" ]; then
   PYTHON3=$(dirname $0)/python/3.7.4-2_64bit/bin/python3
   if [ -e $PYTHON3 ]; then
     EMSDK_PYTHON=$PYTHON3
+
     # When using our bundled python we never want the users
     # PYTHONHOME or PYTHONPATH
     # https://github.com/emscripten-core/emsdk/issues/598
     unset PYTHONHOME
     unset PYTHONPATH
+
+    # This is needed for MacOS.  Without this, the urlopen
+    # code will try to use /usr/local/etc/openssl/cert.pem
+    # which may or may not exist on the system.
+    export SSL_CERT_FILE=$(dirname $0)/python/3.7.4-2_64bit/lib/python3.7/site-packages/certifi/cacert.pem
   fi
 fi
 
diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 8b01d57b01..0bb0e481bb 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -294,7 +294,7 @@
     "macos_url": "python-3.7.4-2-macos.tar.gz",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
-    "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3"
+    "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.7/site-packages/certifi/cacert.pem"
   },
   {
     "id": "java",

From f3e2e43213ca7115c5523d200f680db2de914314 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Sat, 24 Oct 2020 10:42:23 -0700
Subject: [PATCH 087/161] 2.0.8 (#643)

---
 bazel/WORKSPACE              | 6 +++---
 emscripten-releases-tags.txt | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index d422c1065d..7c3588b8e9 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -8,12 +8,12 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
 
-# emscripten 2.0.7
+# emscripten 2.0.8
 http_archive(
     name = "emscripten",
-    sha256 = "e56accd855a397518caa793760f04c43a53e21e8f000a30b568eceec0c6713bc",
+    sha256 = "96540a6110e079e9fa6c55c2e3ebc1f0a6a3f7fc63014b2cbfa84300c5f6ee4c",
     strip_prefix = "install",
-    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/d7a29d82b320e471203b69d43aaf03b560eedc54/wasm-binaries.tbz2",
+    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/e4ed6c79f4db8b175d9bbe55869b697aba9bcf2a/wasm-binaries.tbz2",
     build_file = "//emscripten_toolchain:emscripten.BUILD",
     type = "tar.bz2",
 )
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index c262e196ad..60a92e2d90 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.7",
+  "latest": "2.0.8",
   "releases": {
+    "2.0.8":   "e4ed6c79f4db8b175d9bbe55869b697aba9bcf2a",
     "2.0.7":   "d7a29d82b320e471203b69d43aaf03b560eedc54",
     "2.0.6":   "4ba921c8c8fe2e8cae071ca9889d5c27f5debd87",
     "2.0.5":   "461f0f118d8d8e6cfd84e077f3eb010c17a39032",

From 4a695be3485a6f3189cef079ec1928ee192c96de Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 27 Oct 2020 12:59:50 -0700
Subject: [PATCH 088/161] circleci: Add explict version to
 `setup_remote_docker`. NFC. (#646)

Apparently we are supposed to do this:
 https://discuss.circleci.com/t/old-linux-machine-image-remote-docker-deprecation/37572
---
 .circleci/config.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5d2a1f5acf..7994d6d896 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -100,7 +100,8 @@ jobs:
       - run:
           name: install docker
           command: apt-get update -q && apt-get install -q -y docker.io
-      - setup_remote_docker
+      - setup_remote_docker:
+          version: 19.03.13
       # Build and test the tip-of-tree build of EMSDK
       - run:
           name: build
@@ -116,7 +117,8 @@ jobs:
       - run:
           name: install docker
           command: apt-get update -q && apt-get install -q -y docker.io
-      - setup_remote_docker
+      - setup_remote_docker:
+          version: 19.03.13
       - run:
           name: build
           command: make -C ./docker version=${CIRCLE_TAG} build

From 40780130aa995872b777468c9ed60afe45af6601 Mon Sep 17 00:00:00 2001
From: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
Date: Fri, 30 Oct 2020 22:57:15 -0500
Subject: [PATCH 089/161] fix: emsdk swallows/overwrites parts of PATH (#642)

This PR has three changes:

1) Fixing --permanent flag:
The previous algorithm looped over the values of PATH 4 times to check conditions while these conditions are the opposite of each other. Also, the result did not include all the parts in the whole_path.

	I have combined these loops and fixed the algorithm, so no path is lost. Now using --permanent the PATH and Env variables are correctly updated.

2) Fixing --system flag:
Now, the system flag does not cause the PATH values to be overwritten/clobbered. The PATH/Env variables are correctly updated.

3) Fixing flagless flag:
When no flag is provided the value of process/shell is correctly updated and preserved.

This adds the tests for all the situations.

Fixes #634
Fixes #645
---
 .circleci/config.yml               |  37 ++++++-
 emsdk.py                           |  70 ++++++-------
 scripts/test_activation.ps1        | 122 +++++++++++++++++++++++
 scripts/test_path_preservation.ps1 | 151 +++++++++++++++++++++++++++++
 scripts/test_permanent.ps1         |  56 -----------
 5 files changed, 345 insertions(+), 91 deletions(-)
 create mode 100644 scripts/test_activation.ps1
 create mode 100644 scripts/test_path_preservation.ps1
 delete mode 100644 scripts/test_permanent.ps1

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7994d6d896..d5ff7d6309 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -87,11 +87,46 @@ jobs:
           command: |
             source emsdk_env.sh
             python scripts/test.py
+
+      - run:
+          name: flagless (process/shell) test
+          shell: powershell.exe
+          command: |
+            scripts/test_activation.ps1
+
       - run:
           name: --permanent test
           shell: powershell.exe
           command: |
-            scripts/test_permanent.ps1
+            $env:PERMANENT_FLAG="--permanent"
+            scripts/test_activation.ps1
+
+      - run:
+          name: --system test
+          shell: powershell.exe
+          command: |
+            $env:SYSTEM_FLAG="--system"
+            scripts/test_activation.ps1
+
+      - run:
+          name: Process/Shell PATH preservation test
+          shell: powershell.exe
+          command: |
+            scripts/test_path_preservation.ps1
+
+      - run:
+          name: User PATH preservation test
+          shell: powershell.exe
+          command: |
+            $env:PERMANENT_FLAG="--permanent"
+            scripts/test_path_preservation.ps1
+
+      - run:
+          name: System PATH preservation test
+          shell: powershell.exe
+          command: |
+            $env:SYSTEM_FLAG="--system"
+            scripts/test_path_preservation.ps1
 
   build-docker-image:
     executor: bionic
diff --git a/emsdk.py b/emsdk.py
index 503224444d..1e33b941eb 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -322,7 +322,10 @@ def win_set_environment_variable_direct(key, value, system=True):
       folder.Close()
 
 
-def win_get_environment_variable(key, system=True, fallback=True):
+def win_get_environment_variable(key, system=True, user=True, fallback=True):
+  if (not system and not user and fallback):
+    # if no --system or --permanent flag is provided use shell's value
+    return os.environ[key]
   try:
     folder = None
     try:
@@ -355,21 +358,9 @@ def win_get_environment_variable(key, system=True, fallback=True):
   return value
 
 
-def win_environment_variable_exists(key, system=True):
-  value = win_get_environment_variable(key, system)
-  return value is not None and len(value) > 0
-
-
-def win_get_active_environment_variable(key):
-  value = win_get_environment_variable(key, False)
-  if value is not None:
-    return value
-  return win_get_environment_variable(key, True)
-
-
-def win_set_environment_variable(key, value, system=True):
+def win_set_environment_variable(key, value, system, user):
   debug_print('set ' + str(key) + '=' + str(value) + ', in system=' + str(system), file=sys.stderr)
-  previous_value = win_get_environment_variable(key, system, fallback=False)
+  previous_value = win_get_environment_variable(key, system=system, user=user)
   if previous_value == value:
     debug_print('  no need to set, since same value already exists.')
     # No need to elevate UAC for nothing to set the same value, skip.
@@ -409,14 +400,14 @@ def win_set_environment_variable(key, value, system=True):
   return False
 
 
-def win_set_environment_variables(env_vars_to_add, system):
+def win_set_environment_variables(env_vars_to_add, system, user):
   if not env_vars_to_add:
     return
 
   changed = False
 
   for key, value in env_vars_to_add:
-    if win_set_environment_variable(key, value, system):
+    if win_set_environment_variable(key, value, system, user):
       if not changed:
         changed = True
         print('Setting global environment variables:')
@@ -443,9 +434,9 @@ def win_set_environment_variables(env_vars_to_add, system):
     errlog('SendMessageTimeout failed with error: ' + str(e))
 
 
-def win_delete_environment_variable(key, system=True):
+def win_delete_environment_variable(key, system=True, user=True):
   debug_print('win_delete_environment_variable(key=' + key + ', system=' + str(system) + ')')
-  return win_set_environment_variable(key, None, system)
+  return win_set_environment_variable(key, None, system, user)
 
 
 # Returns the absolute pathname to the given path inside the Emscripten SDK.
@@ -2449,12 +2440,12 @@ def set_active_tools(tools_to_activate, permanently_activate, system):
   if WINDOWS:
     # always set local environment variables since permanently activating will only set the registry settings and
     # will not affect the current session
-    env_vars_to_add = get_env_vars_to_add(tools_to_activate)
+    env_vars_to_add = get_env_vars_to_add(tools_to_activate, system, user=permanently_activate)
     env_string = construct_env_with_vars(env_vars_to_add)
     write_set_env_script(env_string)
 
     if permanently_activate:
-      win_set_environment_variables(env_vars_to_add, system)
+      win_set_environment_variables(env_vars_to_add, system, user=permanently_activate)
 
   return tools_to_activate
 
@@ -2500,23 +2491,34 @@ def to_msys_path(p):
 
 # Looks at the current PATH and adds and removes entries so that the PATH reflects
 # the set of given active tools.
-def adjusted_path(tools_to_activate, system=False):
+def adjusted_path(tools_to_activate, system=False, user=False):
   # These directories should be added to PATH
   path_add = get_required_path(tools_to_activate)
   # These already exist.
   if WINDOWS and not MSYS:
-    existing_path = win_get_environment_variable('PATH', system=system).split(ENVPATH_SEPARATOR)
+    existing_path = win_get_environment_variable('PATH', system=system, user=user, fallback=True).split(ENVPATH_SEPARATOR)
   else:
     existing_path = os.environ['PATH'].split(ENVPATH_SEPARATOR)
   emsdk_root_path = to_unix_path(emsdk_path())
 
-  existing_emsdk_tools = [i for i in existing_path if to_unix_path(i).startswith(emsdk_root_path)]
-  new_emsdk_tools = [i for i in path_add if not normalized_contains(existing_emsdk_tools, i)]
+  existing_emsdk_tools = []
+  existing_nonemsdk_path = []
+  for entry in existing_path:
+    if to_unix_path(entry).startswith(emsdk_root_path):
+      existing_emsdk_tools.append(entry)
+    else:
+      existing_nonemsdk_path.append(entry)
+
+  new_emsdk_tools = []
+  kept_emsdk_tools = []
+  for entry in path_add:
+    if not normalized_contains(existing_emsdk_tools, entry):
+      new_emsdk_tools.append(entry)
+    else:
+      kept_emsdk_tools.append(entry)
+
+  whole_path = unique_items(new_emsdk_tools + kept_emsdk_tools + existing_nonemsdk_path)
 
-  # Existing non-emsdk tools
-  existing_path = [i for i in existing_path if not to_unix_path(i).startswith(emsdk_root_path)]
-  new_path = [i for i in path_add if not normalized_contains(existing_path, i)]
-  whole_path = unique_items(new_path + existing_path)
   if MSYS:
     # XXX Hack: If running native Windows Python in MSYS prompt where PATH
     # entries look like "/c/Windows/System32", os.environ['PATH']
@@ -2529,10 +2531,10 @@ def adjusted_path(tools_to_activate, system=False):
   return (separator.join(whole_path), new_emsdk_tools)
 
 
-def get_env_vars_to_add(tools_to_activate):
+def get_env_vars_to_add(tools_to_activate, system, user):
   env_vars_to_add = []
 
-  newpath, added_path = adjusted_path(tools_to_activate)
+  newpath, added_path = adjusted_path(tools_to_activate, system, user)
 
   # Don't bother setting the path if there are no changes.
   if os.environ['PATH'] != newpath:
@@ -2564,8 +2566,8 @@ def get_env_vars_to_add(tools_to_activate):
   return env_vars_to_add
 
 
-def construct_env(tools_to_activate):
-  return construct_env_with_vars(get_env_vars_to_add(tools_to_activate))
+def construct_env(tools_to_activate, system, user):
+  return construct_env_with_vars(get_env_vars_to_add(tools_to_activate, system, user))
 
 
 def construct_env_with_vars(env_vars_to_add):
@@ -2978,7 +2980,7 @@ def print_tools(t):
     # to write out the new one.
     tools_to_activate = currently_active_tools()
     tools_to_activate = process_tool_list(tools_to_activate, log_errors=True)
-    env_string = construct_env(tools_to_activate)
+    env_string = construct_env(tools_to_activate, arg_system, arg_permanent)
     if WINDOWS and not BASH:
       write_set_env_script(env_string)
     else:
diff --git a/scripts/test_activation.ps1 b/scripts/test_activation.ps1
new file mode 100644
index 0000000000..98ebada623
--- /dev/null
+++ b/scripts/test_activation.ps1
@@ -0,0 +1,122 @@
+# This test installs emsdk and activates the latest toolchain using `--system` or `--permanent` flags,
+# and checks if the environment variables and PATH are correctly updated. Set $env:SYSTEM_FLAG and $env:PERMANENT_FLAG to test each.
+# If no flag is provided the process/shell values are tested. See the CI file for an example.
+
+refreshenv
+
+$repo_root = [System.IO.Path]::GetDirectoryName((resolve-path "$PSScriptRoot"))
+
+$PATH_USER_BEFORE = [System.Environment]::GetEnvironmentVariable("PATH", "User")
+$PATH_MACHINE_BEFORE = [System.Environment]::GetEnvironmentVariable("PATH", "Machine")
+$PATH_Process_BEFORE = [System.Environment]::GetEnvironmentVariable("PATH", "Process")
+
+
+try {
+
+    & "$repo_root/emsdk.ps1" install latest
+
+    $esc = '--%'
+    & "$repo_root/emsdk.ps1" activate latest $esc $env:PERMANENT_FLAG $env:SYSTEM_FLAG
+
+    if ($env:SYSTEM_FLAG) {
+        $env_type = "Machine"
+    }
+    elseif ($env:PERMANENT_FLAG) {
+        $env_type = "User"
+    } else {
+        $env_type = "Process"
+    }
+
+    $EMSDK = [System.Environment]::GetEnvironmentVariable("EMSDK", $env_type)
+    $EM_CONFIG = [System.Environment]::GetEnvironmentVariable("EM_CONFIG", $env_type)
+    $EMSDK_NODE = [System.Environment]::GetEnvironmentVariable("EMSDK_NODE", $env_type)
+    $EMSDK_PYTHON = [System.Environment]::GetEnvironmentVariable("EMSDK_PYTHON", $env_type)
+    $JAVA_HOME = [System.Environment]::GetEnvironmentVariable("JAVA_HOME", $env_type)
+    $EM_CACHE = [System.Environment]::GetEnvironmentVariable("EM_CACHE", $env_type)
+    $PATH = [System.Environment]::GetEnvironmentVariable("PATH", $env_type)
+
+    if (!$EMSDK) {
+        throw "EMSDK is not set for the user"
+    }
+    if (!$EM_CONFIG) {
+        throw "EM_CONFIG is not set for the user"
+    }
+    if (!$EMSDK_NODE) {
+        throw "EMSDK_NODE is not set for the user"
+    }
+    if (!$JAVA_HOME) {
+        throw "JAVA_HOME is not set for the user"
+    }
+    if (!$EMSDK_PYTHON) {
+        throw "EMSDK_PYTHON is not set for the user"
+    }
+    if (!$EM_CACHE) {
+        throw "EM_CACHE is not set for the user"
+    }
+
+
+    $path_split = $PATH.Split(';')
+
+    $EMSDK_Path = $path_split | Where-Object { $_ -like "$repo_root*" }
+    if (!$EMSDK_Path) {
+        throw "No path is added!"
+    }
+    $EMSDK_NODE_Path = $path_split | Where-Object { $_ -like "$repo_root\node*" }
+    if (!$EMSDK_NODE_Path) {
+        throw "$repo_root\\node is not added to path."
+    }
+    $EMSDK_PYTHON_Path = $path_split | Where-Object { $_ -like "$repo_root\python*" }
+    if (!$EMSDK_PYTHON_Path) {
+        throw "$repo_root\\python is not added to path."
+    }
+    $EMSDK_JAVA_Path = $path_split | Where-Object { $_ -like "$repo_root\java*" }
+    if (!$EMSDK_JAVA_Path) {
+        throw "$repo_root\\java is not added to path."
+    }
+
+    $EMSDK_UPSTREAM_Path = $path_split | Where-Object { $_ -like "$repo_root\upstream\emscripten*" }
+    if (!$EMSDK_UPSTREAM_Path) {
+        throw "$repo_root\\upstream\emscripten is not added to path."
+    }
+
+
+}
+finally {
+    # Recover pre-split PATH
+    refreshenv
+
+    [Environment]::SetEnvironmentVariable("Path", $PATH_USER_BEFORE, "User")
+    try {
+        [Environment]::SetEnvironmentVariable("Path", $PATH_MACHINE_BEFORE, "Machine")
+    }
+    catch {}
+
+    [Environment]::SetEnvironmentVariable("Path", $PATH_Process_BEFORE, "Process")
+
+    # Recover pre activation env variables
+    [Environment]::SetEnvironmentVariable("EMSDK", $null, "User")
+    [Environment]::SetEnvironmentVariable("EM_CONFIG", $null, "User")
+    [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "User")
+    [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "User")
+    [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "User")
+    [Environment]::SetEnvironmentVariable("EM_CACHE", $null, "User")
+
+    try {
+        [Environment]::SetEnvironmentVariable("EMSDK", $null, "Machine")
+        [Environment]::SetEnvironmentVariable("EM_CONFIG", $null, "Machine")
+        [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Machine")
+        [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Machine")
+        [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Machine")
+        [Environment]::SetEnvironmentVariable("EM_CACHE", $null, "Machine")
+    } catch {}
+
+
+    [Environment]::SetEnvironmentVariable("EMSDK", $null, "Process")
+    [Environment]::SetEnvironmentVariable("EM_CONFIG", $null, "Process")
+    [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Process")
+    [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Process")
+    [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Process")
+    [Environment]::SetEnvironmentVariable("EM_CACHE", $null, "Process")
+
+    refreshenv
+}
diff --git a/scripts/test_path_preservation.ps1 b/scripts/test_path_preservation.ps1
new file mode 100644
index 0000000000..79a42d93bd
--- /dev/null
+++ b/scripts/test_path_preservation.ps1
@@ -0,0 +1,151 @@
+# This test installs emsdk and activates the latest toolchain using `--system` or `--permanent` flags,
+# and checks if parts of PATH are lost or overwritten. Set $env:SYSTEM_FLAG and $env:PERMANENT_FLAG to test each.
+# If no flag is provided the process/shell values are tested. See the CI file for an example.
+
+refreshenv
+
+$repo_root = [System.IO.Path]::GetDirectoryName((resolve-path "$PSScriptRoot"))
+
+$PATH_USER_BEFORE = [System.Environment]::GetEnvironmentVariable("PATH", "User")
+$PATH_MACHINE_BEFORE = [System.Environment]::GetEnvironmentVariable("PATH", "Machine")
+$PATH_Process_BEFORE = [System.Environment]::GetEnvironmentVariable("PATH", "Process")
+
+try {
+
+
+    & "$repo_root/emsdk.ps1" install latest
+
+    $esc = '--%'
+    & "$repo_root/emsdk.ps1" activate latest $esc $env:PERMANENT_FLAG $env:SYSTEM_FLAG
+
+    $PATH_USER = [System.Environment]::GetEnvironmentVariable("PATH", "User")
+    $PATH_MACHINE = [System.Environment]::GetEnvironmentVariable("PATH", "Machine")
+    $PATH_Process = [System.Environment]::GetEnvironmentVariable("PATH", "Process")
+
+    if ($env:SYSTEM_FLAG) {
+        echo "--system test............................."
+        $path_before_arr = $PATH_MACHINE_BEFORE.Split(';')
+        $path_arr = $PATH_MACHINE.Split(';')
+    }
+    elseif ($env:PERMANENT_FLAG) {
+        echo "--permanent test.........................."
+        $path_before_arr = $PATH_USER_BEFORE.Split(';')
+        $path_arr = $PATH_USER.Split(';')
+    } else {
+        echo "no flag test (shell/process).............."
+        $path_before_arr = $PATH_Process_BEFORE.Split(';')
+        $path_arr = $PATH_Process.Split(';')
+    }
+
+
+    $EMSDK_Path = $path_arr | Where-Object { $_ -like "$repo_root*" }
+    $EMSDK_NODE_Path = $path_arr | Where-Object { $_ -like "$repo_root\node*" }
+    $EMSDK_PYTHON_Path = $path_arr | Where-Object { $_ -like "$repo_root\python*" }
+    $EMSDK_JAVA_Path = $path_arr | Where-Object { $_ -like "$repo_root\java*" }
+    $EMSDK_UPSTREAM_Path = $path_arr | Where-Object { $_ -like "$repo_root\upstream\emscripten*" }
+
+    $number_of_items = $path_arr.count
+    [System.Collections.ArrayList]$rest_of_path = @()
+    Foreach ($item in $path_arr) {
+        if (
+            ($item -like "$repo_root*") -or
+            ($item -like "$repo_root\node*") -or
+            ($item -like "$repo_root\python*") -or
+            ($item -like "$repo_root\java*") -or
+            ($item -like "$repo_root\upstream\emscripten*")
+        ) {
+            echo "$item is on the PATH"
+        }
+        else {
+            $rest_of_path.add($item) | Out-Null
+        }
+    }
+
+    # compare the PATHs before activation and after activation
+    if (Compare-Object -ReferenceObject $path_before_arr -DifferenceObject $rest_of_path ) {
+        echo "Old path is ............................."
+        echo $path_before_arr
+        echo "Current rest of path is ................."
+        echo $rest_of_path
+        throw "some parts of PATH are removed"
+    }
+
+    # Compare the other untouched PATH
+    if ($env:SYSTEM_FLAG) {
+        if (Compare-Object -ReferenceObject $PATH_USER_BEFORE.Split(';') -DifferenceObject $PATH_USER.Split(';') ) {
+            echo "Old user path is ...................."
+            echo $PATH_USER_BEFORE
+            echo "Current user path is ................"
+            echo $PATH_USER
+            throw "User PATH are changed while --system had been provided"
+        }
+    }
+    elseif ($env:PERMANENT_FLAG) {
+        if (Compare-Object -ReferenceObject $PATH_MACHINE_BEFORE.Split(';') -DifferenceObject $PATH_MACHINE.Split(';') ) {
+            echo "Old machine path is.................."
+            echo $PATH_MACHINE_BEFORE
+            echo "Current machine path is.............."
+            echo $PATH_MACHINE
+            throw "MACHINE PATH are changed while --system was not provided"
+        }
+    } else {
+        if (
+            (Compare-Object -ReferenceObject $PATH_MACHINE_BEFORE.Split(';') -DifferenceObject $PATH_MACHINE.Split(';')) -or
+            (Compare-Object -ReferenceObject $PATH_MACHINE_BEFORE.Split(';') -DifferenceObject $PATH_MACHINE.Split(';'))
+        ) {
+            echo "Old machine path is.................."
+            echo $PATH_MACHINE_BEFORE
+            echo "Current machine path is.............."
+            echo $PATH_MACHINE
+            echo "Old user path is ...................."
+            echo $PATH_USER_BEFORE
+            echo "Current user path is ................"
+            echo $PATH_USER
+            throw "MACHINE/USER PATH are changed while no flag was provided"
+        }
+    }
+
+
+
+
+}
+finally {
+    # Recover pre-split PATH
+    refreshenv
+
+    [Environment]::SetEnvironmentVariable("Path", $PATH_USER_BEFORE, "User")
+    try {
+        [Environment]::SetEnvironmentVariable("Path", $PATH_MACHINE_BEFORE, "Machine")
+    }
+    catch {}
+
+    [Environment]::SetEnvironmentVariable("Path", $PATH_Process_BEFORE, "Process")
+
+    # Recover pre activation env variables
+    [Environment]::SetEnvironmentVariable("EMSDK", $null, "User")
+    [Environment]::SetEnvironmentVariable("EM_CONFIG", $null, "User")
+    [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "User")
+    [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "User")
+    [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "User")
+    [Environment]::SetEnvironmentVariable("EM_CACHE", $null, "User")
+
+    try {
+        [Environment]::SetEnvironmentVariable("EMSDK", $null, "Machine")
+        [Environment]::SetEnvironmentVariable("EM_CONFIG", $null, "Machine")
+        [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Machine")
+        [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Machine")
+        [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Machine")
+        [Environment]::SetEnvironmentVariable("EM_CACHE", $null, "Machine")
+    } catch {}
+
+
+    [Environment]::SetEnvironmentVariable("EMSDK", $null, "Process")
+    [Environment]::SetEnvironmentVariable("EM_CONFIG", $null, "Process")
+    [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Process")
+    [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Process")
+    [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Process")
+    [Environment]::SetEnvironmentVariable("EM_CACHE", $null, "Process")
+
+    refreshenv
+
+}
diff --git a/scripts/test_permanent.ps1 b/scripts/test_permanent.ps1
deleted file mode 100644
index 4c9da198bf..0000000000
--- a/scripts/test_permanent.ps1
+++ /dev/null
@@ -1,56 +0,0 @@
-$repo_root = [System.IO.Path]::GetDirectoryName((resolve-path "$PSScriptRoot"))
-
-& "$repo_root/emsdk.ps1" install latest
-& "$repo_root/emsdk.ps1" activate latest --permanent
-
-$EMSDK_USER = [System.Environment]::GetEnvironmentVariable("EMSDK", "User")
-$EM_CONFIG_USER = [System.Environment]::GetEnvironmentVariable("EM_CONFIG", "User")
-$EMSDK_NODE_USER = [System.Environment]::GetEnvironmentVariable("EMSDK_NODE", "User")
-$EMSDK_PYTHON_USER = [System.Environment]::GetEnvironmentVariable("EMSDK_PYTHON", "User")
-$JAVA_HOME_USER = [System.Environment]::GetEnvironmentVariable("JAVA_HOME", "User")
-$EM_CACHE_USER = [System.Environment]::GetEnvironmentVariable("EM_CACHE", "User")
-$PATH_USER = [System.Environment]::GetEnvironmentVariable("PATH", "User")
-
-if (!$EMSDK_USER) {
-    throw "EMSDK is not set for the user"
-}
-if (!$EM_CONFIG_USER) {
-    throw "EM_CONFIG_USER is not set for the user"
-}
-if (!$EMSDK_NODE_USER) {
-    throw "EMSDK_NODE is not set for the user"
-}
-if (!$JAVA_HOME_USER) {
-    throw "JAVA_HOME is not set for the user"
-}
-if (!$EMSDK_PYTHON_USER) {
-    throw "EMSDK_PYTHON is not set for the user"
-}
-if (!$EM_CACHE_USER) {
-    throw "EM_CACHE is not set for the user"
-}
-
-
-$path_split = $PATH_USER.Split(';')
-
-$EMSDK_Path_USER = $path_split | Where-Object { $_ -like "$repo_root*" }
-if (!$EMSDK_Path_USER) {
-    throw "No path is added!"
-}
-$EMSDK_NODE_Path_USER = $path_split | Where-Object { $_ -like "$repo_root\node*" }
-if (!$EMSDK_NODE_Path_USER) {
-    throw "$repo_root\\node is not added to path."
-}
-$EMSDK_PYTHON_Path_USER = $path_split | Where-Object { $_ -like "$repo_root\python*" }
-if (!$EMSDK_PYTHON_Path_USER) {
-    throw "$repo_root\\python is not added to path."
-}
-$EMSDK_JAVA_Path_USER = $path_split | Where-Object { $_ -like "$repo_root\java*" }
-if (!$EMSDK_JAVA_Path_USER) {
-    throw "$repo_root\\java is not added to path."
-}
-
-$EMSDK_UPSTREAM_Path_USER = $path_split | Where-Object { $_ -like "$repo_root\upstream\emscripten*" }
-if (!$EMSDK_UPSTREAM_Path_USER) {
-    throw "$repo_root\\upstream\emscripten is not added to path."
-}

From 8f2f5e3435f6d0978469406a344a57a0d558deb1 Mon Sep 17 00:00:00 2001
From: juj <jujjyl@gmail.com>
Date: Sun, 8 Nov 2020 14:52:43 +0200
Subject: [PATCH 090/161] Fix regression where reinstalling tools from git
 sources would not git pull and rebuild them. (#647)

---
 emsdk.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index 1e33b941eb..1ac1e054e6 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -1862,7 +1862,11 @@ def install_sdk(self):
     return True
 
   def install_tool(self):
-    if self.is_installed():
+    # Avoid doing a redundant reinstall of the tool, if it has already been installed.
+    # However all tools that are sourced directly from git branches do need to be
+    # installed every time when requested, since the install step is then used to git
+    # pull the tool to a newer version.
+    if self.is_installed() and not hasattr(self, 'git_branch'):
       print("Skipped installing " + self.name + ", already installed.")
       return True
 

From 372fb501244f29734b61f889a2ef24c2456a3484 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Mon, 16 Nov 2020 14:58:38 -0800
Subject: [PATCH 091/161] 2.0.9 (#653)

---
 bazel/WORKSPACE              | 6 +++---
 emscripten-releases-tags.txt | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index 7c3588b8e9..b46b612f44 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -8,12 +8,12 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
 
-# emscripten 2.0.8
+# emscripten 2.0.9
 http_archive(
     name = "emscripten",
-    sha256 = "96540a6110e079e9fa6c55c2e3ebc1f0a6a3f7fc63014b2cbfa84300c5f6ee4c",
+    sha256 = "42e06a5ad4b369fcb435db097edb8c4fb824b3125a3b8996aca6f10bc79d9dca",
     strip_prefix = "install",
-    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/e4ed6c79f4db8b175d9bbe55869b697aba9bcf2a/wasm-binaries.tbz2",
+    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/d8e430f9a9b6e87502f826c39e7684852f59624f/wasm-binaries.tbz2",
     build_file = "//emscripten_toolchain:emscripten.BUILD",
     type = "tar.bz2",
 )
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 60a92e2d90..99e1c1cab1 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.8",
+  "latest": "2.0.9",
   "releases": {
+    "2.0.9":   "d8e430f9a9b6e87502f826c39e7684852f59624f",
     "2.0.8":   "e4ed6c79f4db8b175d9bbe55869b697aba9bcf2a",
     "2.0.7":   "d7a29d82b320e471203b69d43aaf03b560eedc54",
     "2.0.6":   "4ba921c8c8fe2e8cae071ca9889d5c27f5debd87",

From aa5fedfe291d05ceb4753be8af2acf0478a4a9d6 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Wed, 25 Nov 2020 13:41:59 -0800
Subject: [PATCH 092/161] Increate download chunk size of 256k (#657)

With 8k the download status if updated way faster than is
necessary.
---
 emsdk.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index 1ac1e054e6..f34483003a 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -694,7 +694,7 @@ def download_file(url, dstpath, download_even_if_exists=False, filename_prefix='
       # Draw a progress bar 80 chars wide (in non-TTY mode)
       progress_max = 80 - 4
       progress_shown = 0
-      block_sz = 8192
+      block_sz = 256 * 1024
       if not TTY_OUTPUT:
           print(' [', end='')
       while True:

From 62fb1718b8866ccd6640d7937b3854edd48ed5ce Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 30 Nov 2020 17:44:53 -0800
Subject: [PATCH 093/161] Remove used arg in scripts/test.bat (#659)

I have no idea why this argument was included when this
script was first added.  `emsdk_env.bat` does not even pass
its argument into `emsdk.py` so this argument has no effect
here.
---
 scripts/test.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/test.bat b/scripts/test.bat
index 9dd53328e3..6f8cb33a39 100755
--- a/scripts/test.bat
+++ b/scripts/test.bat
@@ -2,6 +2,6 @@
 set PATH=%PATH%;%PYTHON_BIN%
 @CALL emsdk install latest
 @CALL emsdk activate latest
-@CALL emsdk_env.bat --build=Release
+@CALL emsdk_env.bat
 @CALL python -c "import sys; print(sys.executable)"
 @CALL emcc.bat -v

From ec9c1c45f56a2df30b3de8156e98facdb0705da8 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 4 Dec 2020 08:53:37 -0800
Subject: [PATCH 094/161] 2.0.10 (#664)

---
 bazel/WORKSPACE              | 6 +++---
 emscripten-releases-tags.txt | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index b46b612f44..9a40c92ea0 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -8,12 +8,12 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
 
-# emscripten 2.0.9
+# emscripten 2.0.10
 http_archive(
     name = "emscripten",
-    sha256 = "42e06a5ad4b369fcb435db097edb8c4fb824b3125a3b8996aca6f10bc79d9dca",
+    sha256 = "5bb30bb70e97080c24dcb47cbd891f0d8c2fb393c17af35aaad5e18c0e60b175",
     strip_prefix = "install",
-    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/d8e430f9a9b6e87502f826c39e7684852f59624f/wasm-binaries.tbz2",
+    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/37fc7647c754ac9a28ad588c143b82286de0ef71/wasm-binaries.tbz2",
     build_file = "//emscripten_toolchain:emscripten.BUILD",
     type = "tar.bz2",
 )
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 99e1c1cab1..96c84f6f66 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.9",
+  "latest": "2.0.10",
   "releases": {
+    "2.0.10":  "37fc7647c754ac9a28ad588c143b82286de0ef71",
     "2.0.9":   "d8e430f9a9b6e87502f826c39e7684852f59624f",
     "2.0.8":   "e4ed6c79f4db8b175d9bbe55869b697aba9bcf2a",
     "2.0.7":   "d7a29d82b320e471203b69d43aaf03b560eedc54",

From 8234fb3b9571753e9cd6921d1f82dcf2c6232bd3 Mon Sep 17 00:00:00 2001
From: Harald Reingruber <haraldreingruber@users.noreply.github.com>
Date: Fri, 11 Dec 2020 22:26:07 +0100
Subject: [PATCH 095/161] Add git-lfs package to emsdk Docker image (#665)

Having LFS support already in the image saves some build time and allows a more consistent experience to other CI build images.
---
 docker/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f58c5cee44..48ff1a84e9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -101,6 +101,7 @@ RUN echo "## Update and install packages" \
         zip \
         unzip \
         git \
+        git-lfs \
         ssh-client \
         build-essential \
         make \

From 5fd57ff72387a1dd9b8050c5d21b2405825e7bb0 Mon Sep 17 00:00:00 2001
From: Derek Schuff <dschuff@chromium.org>
Date: Thu, 17 Dec 2020 14:47:38 -0800
Subject: [PATCH 096/161] 2.0.11 (#670)

---
 bazel/WORKSPACE              | 6 +++---
 emscripten-releases-tags.txt | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index 9a40c92ea0..c601c949b1 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -8,12 +8,12 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
 
-# emscripten 2.0.10
+# emscripten 2.0.11
 http_archive(
     name = "emscripten",
-    sha256 = "5bb30bb70e97080c24dcb47cbd891f0d8c2fb393c17af35aaad5e18c0e60b175",
+    sha256 = "33822a13b1731cf40199f3014e1dd59509c329173553b86e5a79b9a99d475e00",
     strip_prefix = "install",
-    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/37fc7647c754ac9a28ad588c143b82286de0ef71/wasm-binaries.tbz2",
+    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/4764c5c323a474f7ba28ae991b0c9024fccca43c/wasm-binaries.tbz2",
     build_file = "//emscripten_toolchain:emscripten.BUILD",
     type = "tar.bz2",
 )
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 96c84f6f66..a62794643d 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.10",
+  "latest": "2.0.11",
   "releases": {
+    "2.0.11":  "4764c5c323a474f7ba28ae991b0c9024fccca43c",
     "2.0.10":  "37fc7647c754ac9a28ad588c143b82286de0ef71",
     "2.0.9":   "d8e430f9a9b6e87502f826c39e7684852f59624f",
     "2.0.8":   "e4ed6c79f4db8b175d9bbe55869b697aba9bcf2a",

From 4def4da4d49b24dd2ec14693b6a2a2345e8363f8 Mon Sep 17 00:00:00 2001
From: Zhang Fan <fzhangtj@gmail.com>
Date: Tue, 5 Jan 2021 20:27:16 +0800
Subject: [PATCH 097/161] fix sln parsing form vs2019 (#679)

---
 emsdk.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index f34483003a..6d30c56d2d 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -917,7 +917,7 @@ def build_env(generator):
 
 def get_generator_for_sln_file(sln_file):
   contents = open(sln_file, 'r').read()
-  if '# Visual Studio 16' in contents:  # VS2019
+  if '# Visual Studio 16' in contents or '# Visual Studio Version 16' in contents:  # VS2019
     return 'Visual Studio 16'
   if '# Visual Studio 15' in contents:  # VS2017
     return 'Visual Studio 15'

From 5ad9d720c37d451e4dc8547ec516b8194455ce53 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Sat, 9 Jan 2021 07:25:52 -0800
Subject: [PATCH 098/161] 2.0.12 (#680)

---
 bazel/WORKSPACE              | 6 +++---
 emscripten-releases-tags.txt | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index c601c949b1..d7c68a49e2 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -8,12 +8,12 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
 
-# emscripten 2.0.11
+# emscripten 2.0.12
 http_archive(
     name = "emscripten",
-    sha256 = "33822a13b1731cf40199f3014e1dd59509c329173553b86e5a79b9a99d475e00",
+    sha256 = "bfff9fb0326363c12e19b542f27a5f12cedbfc310f30621dc497c9af51d2d2e3",
     strip_prefix = "install",
-    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/4764c5c323a474f7ba28ae991b0c9024fccca43c/wasm-binaries.tbz2",
+    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/dcf819a7821f8db0c8f15ac336fea8960ec204f5/wasm-binaries.tbz2",
     build_file = "//emscripten_toolchain:emscripten.BUILD",
     type = "tar.bz2",
 )
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index a62794643d..a48f06bf43 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.11",
+  "latest": "2.0.12",
   "releases": {
+    "2.0.12":  "dcf819a7821f8db0c8f15ac336fea8960ec204f5",
     "2.0.11":  "4764c5c323a474f7ba28ae991b0c9024fccca43c",
     "2.0.10":  "37fc7647c754ac9a28ad588c143b82286de0ef71",
     "2.0.9":   "d8e430f9a9b6e87502f826c39e7684852f59624f",

From 6357c6dcab65ebdda86c5a75945c508b3038cb59 Mon Sep 17 00:00:00 2001
From: Matthew McRaven <35609985+Matthew-McRaven@users.noreply.github.com>
Date: Thu, 21 Jan 2021 18:57:59 -0800
Subject: [PATCH 099/161] Set binaryen's git branch to `main` in manifest.
 (#684)

Binaryen renamed their default branch to main from master.
This breaks builds of the SDK from the sources.

This commit retargets binaryen builds to use the git branch `main` when appropriate.
The version name "master" remains the same to maintain compatibility with existing build scripts

Fixes #683.
---
 emsdk_manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 0bb0e481bb..4a613b9e04 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -420,7 +420,7 @@
     "bitness": 32,
     "append_bitness": false,
     "url": "https://github.com/WebAssembly/binaryen.git",
-    "git_branch": "master",
+    "git_branch": "main",
     "activated_cfg": "BINARYEN_ROOT='%installation_dir%%generator_prefix%_32bit_binaryen'",
     "activated_path": "%installation_dir%%generator_prefix%_32bit_binaryen/bin",
     "activated_env": "BINARYEN_ROOT=%installation_dir%%generator_prefix%_32bit_binaryen",
@@ -435,7 +435,7 @@
     "bitness": 64,
     "append_bitness": false,
     "url": "https://github.com/WebAssembly/binaryen.git",
-    "git_branch": "master",
+    "git_branch": "main",
     "activated_cfg": "BINARYEN_ROOT='%installation_dir%%generator_prefix%_64bit_binaryen'",
     "activated_path": "%installation_dir%%generator_prefix%_64bit_binaryen/bin",
     "activated_env": "BINARYEN_ROOT=%installation_dir%%generator_prefix%_64bit_binaryen",

From 5fd6f034fe07a3def81fa9cb086e4704d057cb17 Mon Sep 17 00:00:00 2001
From: Leven <308865427@qq.com>
Date: Wed, 27 Jan 2021 03:17:30 +0800
Subject: [PATCH 100/161] fix: bazel/emscripten_toolchain/wasm_binary.py 
 command output without mimetype on MacOS. (#682)

Co-authored-by: xulinfeng <xulinfeng@bilibili.com>
---
 bazel/emscripten_toolchain/emscripten_config | 8 ++++++--
 bazel/emscripten_toolchain/wasm_binary.py    | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bazel/emscripten_toolchain/emscripten_config b/bazel/emscripten_toolchain/emscripten_config
index 4a77344ef0..02a1a54bff 100644
--- a/bazel/emscripten_toolchain/emscripten_config
+++ b/bazel/emscripten_toolchain/emscripten_config
@@ -1,9 +1,13 @@
 import os
+import platform
 
 ROOT_DIR = os.environ["ROOT_DIR"]
 EMSCRIPTEN_ROOT = os.environ["EMSCRIPTEN"]
 
 LLVM_ROOT = ROOT_DIR + "/external/emscripten/bin"
 EMSCRIPTEN_NATIVE_OPTIMIZER = LLVM_ROOT + "/optimizer"
-NODE_JS = ROOT_DIR + "/external/nodejs_linux_amd64/bin/node"
-BINARYEN_ROOT = ROOT_DIR + "/external/emscripten"
+
+system = platform.system()
+nodejs_binary = "node.exe" if(system =="Windows") else "bin/node"
+NODE_JS = ROOT_DIR + "/external/nodejs_{}_amd64/{}".format(system.lower(), nodejs_binary)
+BINARYEN_ROOT = ROOT_DIR + "/external/emscripten"
\ No newline at end of file
diff --git a/bazel/emscripten_toolchain/wasm_binary.py b/bazel/emscripten_toolchain/wasm_binary.py
index 6bb30db509..466e789e61 100644
--- a/bazel/emscripten_toolchain/wasm_binary.py
+++ b/bazel/emscripten_toolchain/wasm_binary.py
@@ -46,7 +46,7 @@ def main(argv):
   stem = basename.split('.')[0]
 
   # Check the type of the input file
-  mimetype_bytes = subprocess.check_output(['file', '-Lib', FLAGS.archive])
+  mimetype_bytes = subprocess.check_output(['file', '-Lb', '--mime-type', '--mime-encoding', FLAGS.archive])
   mimetype = mimetype_bytes.decode(sys.stdout.encoding)
 
   # If we have a tar, extract all files. If we have just a single file, copy it.

From 02edc9765b6da952fcb8aec9d43780af30c833b3 Mon Sep 17 00:00:00 2001
From: Matthew McRaven <35609985+Matthew-McRaven@users.noreply.github.com>
Date: Thu, 28 Jan 2021 17:49:46 -0800
Subject: [PATCH 101/161] Set LLVM's git branch to `main` in manifest. (#693)

LLVM renamed their default branch to main from master.
This breaks builds of the SDK from the sources.

This commit retargets LLVM builds to use the git branch main when appropriate.
The version name "master" remains the same to maintain compatibility with existing build scripts

Fixes #692.
---
 emsdk_manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 4a613b9e04..bbc2fe84b3 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -5,7 +5,7 @@
     "version": "master",
     "bitness": 32,
     "install_path": "llvm/git",
-    "git_branch": "master",
+    "git_branch": "main",
     "url": "https://github.com/llvm/llvm-project.git",
     "custom_install_script": "build_llvm",
     "only_supports_wasm": true,
@@ -19,7 +19,7 @@
     "version": "master",
     "bitness": 64,
     "install_path": "llvm/git",
-    "git_branch": "master",
+    "git_branch": "main",
     "url": "https://github.com/llvm/llvm-project.git",
     "custom_install_script": "build_llvm",
     "only_supports_wasm": true,

From 2c086de21e23d29a21e3ae8e194e04e2a96dcf94 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 29 Jan 2021 16:25:24 -0800
Subject: [PATCH 102/161] Remove redundant testing/downloading (#695)

We have mac linux and windows bots that run this script
on each of those platforms.  This script already runs
`install latest` so there is no need to re-download these
three different archives on each platform.
---
 scripts/test.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/scripts/test.py b/scripts/test.py
index c38de8309e..456a13463a 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -227,14 +227,3 @@ def run_emsdk(cmd):
 run_emsdk('update')
 print('second time')
 run_emsdk('update')
-
-print('verify downloads exist for all OSes')
-latest_hash = TAGS['releases'][TAGS['latest']]
-for osname, suffix in [
-  ('linux', 'tbz2'),
-  ('mac', 'tbz2'),
-  ('win', 'zip')
-]:
-  url = 'https://storage.googleapis.com/webassembly/emscripten-releases-builds/%s/%s/wasm-binaries.%s' % (osname, latest_hash, suffix)
-  print('  checking url: ' + url),
-  check_call('curl --fail --head --silent ' + url, stdout=subprocess.PIPE)

From cfdcf1315be085d9ea401bcf257d618821c772ae Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 29 Jan 2021 18:25:41 -0800
Subject: [PATCH 103/161] Release 2.0.13 and update bazel toolchain (#694)

This change comes with fairly major change to the bazel toolchain.

- Use pre-built cache that comes with emsdk
- Mark cache as readonly using FROZEN_CACHE
- Pass `--sysroot` to match upstream emscripten change
---
 bazel/WORKSPACE                              |  6 +--
 bazel/emscripten_toolchain/crosstool.bzl     | 56 ++++----------------
 bazel/emscripten_toolchain/emscripten_config |  5 +-
 bazel/emscripten_toolchain/env.sh            |  2 -
 emscripten-releases-tags.txt                 |  3 +-
 scripts/test_bazel.sh                        |  2 +-
 6 files changed, 18 insertions(+), 56 deletions(-)

diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index d7c68a49e2..e8c022577a 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -8,12 +8,12 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
 
-# emscripten 2.0.12
+# emscripten 2.0.13
 http_archive(
     name = "emscripten",
-    sha256 = "bfff9fb0326363c12e19b542f27a5f12cedbfc310f30621dc497c9af51d2d2e3",
+    sha256 = "8986ed886e111c661099c5147126b8a379a4040aab6a1f572fe01f0f9b99a343",
     strip_prefix = "install",
-    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/dcf819a7821f8db0c8f15ac336fea8960ec204f5/wasm-binaries.tbz2",
+    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/ce0e4a4d1cab395ee5082a60ebb4f3891a94b256/wasm-binaries.tbz2",
     build_file = "//emscripten_toolchain:emscripten.BUILD",
     type = "tar.bz2",
 )
diff --git a/bazel/emscripten_toolchain/crosstool.bzl b/bazel/emscripten_toolchain/crosstool.bzl
index 31b516ed52..82c5ce1ffb 100644
--- a/bazel/emscripten_toolchain/crosstool.bzl
+++ b/bazel/emscripten_toolchain/crosstool.bzl
@@ -70,9 +70,8 @@ def _impl(ctx):
 
     cc_target_os = "emscripten"
     emscripten_version = ctx.attr.emscripten_version
-    emscripten_root = "external/emscripten/" + emscripten_version
 
-    builtin_sysroot = None
+    builtin_sysroot = "external/emscripten/emscripten/cache/sysroot"
 
     ################################################################
     # Tools
@@ -513,14 +512,7 @@ def _impl(ctx):
         # Language Features
         flag_set(
             actions = all_cpp_compile_actions,
-            flags = [
-                "-std=gnu++17",
-                "-nostdinc",
-                "-Xclang",
-                "-nobuiltininc",
-                "-Xclang",
-                "-nostdsysteminc",
-            ],
+            flags = ["-std=gnu++17", "-nostdinc", "-nostdinc++",],
         ),
 
         # Emscripten-specific settings:
@@ -904,30 +896,10 @@ def _impl(ctx):
             actions = preprocessor_compile_actions +
                       [ACTION_NAMES.cc_flags_make_variable],
             flags = [
-                "-isystem",
-                emscripten_root + "/system/lib/libc/musl/arch/emscripten",
-                "-isystem",
-                emscripten_root + "/system/lib/libc/musl/arch/js",
-                "-isystem",
-                emscripten_root + "/system/local/include",
-                "-isystem",
-                emscripten_root + "/system/include/compat",
-                "-isystem",
-                emscripten_root + "/system/include",
-                "-isystem",
-                emscripten_root + "/system/include/libcxx",
-                "-isystem",
-                emscripten_root + "/system/lib/libcxxabi/include",
-                "-isystem",
-                emscripten_root + "/system/lib/compiler-rt/include",
-                "-isystem",
-                emscripten_root + "/system/include/libc",
-                "-isystem",
-                emscripten_root + "/system/include/gfx",
-                "-isystem",
-                emscripten_root + "/system/include/SDL",
-                "-isystem",
-                emscripten_root + "/lib/clang/12.0.0/include",
+                "-iwithsysroot" + "/include/c++/v1",
+                "-iwithsysroot" + "/include/compat",
+                "-iwithsysroot" + "/include",
+                "-isystem", "external/emscripten/lib/clang/12.0.0/include",
             ],
         ),
         # Inputs and outputs
@@ -1070,18 +1042,10 @@ def _impl(ctx):
     features.append(crosstool_default_flags_feature)
 
     cxx_builtin_include_directories = [
-        emscripten_version + "/system/lib/libc/musl/arch/emscripten",
-        emscripten_version + "/system/lib/libc/musl/arch/js",
-        emscripten_version + "/system/local/include",
-        emscripten_version + "/system/include/compat",
-        emscripten_version + "/system/include",
-        emscripten_version + "/system/include/libcxx",
-        emscripten_version + "/system/lib/compiler-rt/include",
-        emscripten_version + "/system/lib/libcxxabi/include",
-        emscripten_version + "/system/include/libc",
-        emscripten_version + "/system/include/gfx",
-        emscripten_version + "/system/include/SDL",
-        emscripten_version + "/lib/clang/12.0.0/include",
+        "external/emscripten/emscripten/cache/sysroot/include/c++/v1",
+        "external/emscripten/emscripten/cache/sysroot/include/compat",
+        "external/emscripten/emscripten/cache/sysroot/include",
+        "external/emscripten/lib/clang/12.0.0/include",
     ]
 
     artifact_name_patterns = []
diff --git a/bazel/emscripten_toolchain/emscripten_config b/bazel/emscripten_toolchain/emscripten_config
index 02a1a54bff..b7948aca41 100644
--- a/bazel/emscripten_toolchain/emscripten_config
+++ b/bazel/emscripten_toolchain/emscripten_config
@@ -3,11 +3,10 @@ import platform
 
 ROOT_DIR = os.environ["ROOT_DIR"]
 EMSCRIPTEN_ROOT = os.environ["EMSCRIPTEN"]
-
 LLVM_ROOT = ROOT_DIR + "/external/emscripten/bin"
-EMSCRIPTEN_NATIVE_OPTIMIZER = LLVM_ROOT + "/optimizer"
+BINARYEN_ROOT = ROOT_DIR + "/external/emscripten"
+FROZEN_CACHE = True
 
 system = platform.system()
 nodejs_binary = "node.exe" if(system =="Windows") else "bin/node"
 NODE_JS = ROOT_DIR + "/external/nodejs_{}_amd64/{}".format(system.lower(), nodejs_binary)
-BINARYEN_ROOT = ROOT_DIR + "/external/emscripten"
\ No newline at end of file
diff --git a/bazel/emscripten_toolchain/env.sh b/bazel/emscripten_toolchain/env.sh
index 005fa8767a..dfb4ddc29d 100755
--- a/bazel/emscripten_toolchain/env.sh
+++ b/bazel/emscripten_toolchain/env.sh
@@ -2,6 +2,4 @@
 
 export ROOT_DIR=`(pwd -P)`
 export EMSCRIPTEN=${ROOT_DIR}/external/emscripten/emscripten
-
 export EM_CONFIG=${ROOT_DIR}/emscripten_toolchain/emscripten_config
-export EM_CACHE=${ROOT_DIR}/emscripten_toolchain/cache
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index a48f06bf43..61a3456fe5 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.12",
+  "latest": "2.0.13",
   "releases": {
+    "2.0.13":  "ce0e4a4d1cab395ee5082a60ebb4f3891a94b256",
     "2.0.12":  "dcf819a7821f8db0c8f15ac336fea8960ec204f5",
     "2.0.11":  "4764c5c323a474f7ba28ae991b0c9024fccca43c",
     "2.0.10":  "37fc7647c754ac9a28ad588c143b82286de0ef71",
diff --git a/scripts/test_bazel.sh b/scripts/test_bazel.sh
index f1ba3c96df..67145c4fd9 100755
--- a/scripts/test_bazel.sh
+++ b/scripts/test_bazel.sh
@@ -13,7 +13,7 @@ VER=$(grep -oP '(?<=latest\": \")([\d\.]+)(?=\")' \
 HASH=$(grep "${VER}" emscripten-releases-tags.txt \
       | grep -v latest \
       | cut -f4 -d\")
-      
+
 FAILMSG="!!! scripts/update_bazel_toolchain.sh needs to be run !!!"
 
 # Ensure the WORKSPACE file is up to date with the latest version.

From 45cd9dfc0f932c327ddbd1a8c2ebeea6c997dfd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Jalliffier=20Verne?=
 <Volcomix@users.noreply.github.com>
Date: Sun, 7 Feb 2021 20:51:36 +0100
Subject: [PATCH 104/161] Fix: wrong clang path in Bazel toolchain (#699)
 (#700)

---
 bazel/emscripten_toolchain/crosstool.bzl |  4 ++--
 bazel/hello-world/BUILD                  | 10 ++++++++++
 bazel/hello-world/hello-world-simd.cc    | 10 ++++++++++
 scripts/test_bazel.sh                    |  1 +
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 bazel/hello-world/hello-world-simd.cc

diff --git a/bazel/emscripten_toolchain/crosstool.bzl b/bazel/emscripten_toolchain/crosstool.bzl
index 82c5ce1ffb..0da1cb0175 100644
--- a/bazel/emscripten_toolchain/crosstool.bzl
+++ b/bazel/emscripten_toolchain/crosstool.bzl
@@ -899,7 +899,7 @@ def _impl(ctx):
                 "-iwithsysroot" + "/include/c++/v1",
                 "-iwithsysroot" + "/include/compat",
                 "-iwithsysroot" + "/include",
-                "-isystem", "external/emscripten/lib/clang/12.0.0/include",
+                "-isystem", "external/emscripten/lib/clang/13.0.0/include",
             ],
         ),
         # Inputs and outputs
@@ -1045,7 +1045,7 @@ def _impl(ctx):
         "external/emscripten/emscripten/cache/sysroot/include/c++/v1",
         "external/emscripten/emscripten/cache/sysroot/include/compat",
         "external/emscripten/emscripten/cache/sysroot/include",
-        "external/emscripten/lib/clang/12.0.0/include",
+        "external/emscripten/lib/clang/13.0.0/include",
     ]
 
     artifact_name_patterns = []
diff --git a/bazel/hello-world/BUILD b/bazel/hello-world/BUILD
index d0ef7cdd18..1c7e087e30 100644
--- a/bazel/hello-world/BUILD
+++ b/bazel/hello-world/BUILD
@@ -6,7 +6,17 @@ cc_binary(
     srcs = ["hello-world.cc"],
 )
 
+cc_binary(
+    name = "hello-world-simd",
+    srcs = ["hello-world-simd.cc"],
+)
+
 wasm_cc_binary(
     name = "hello-world-wasm",
     cc_target = ":hello-world",
 )
+
+wasm_cc_binary(
+    name = "hello-world-wasm-simd",
+    cc_target = ":hello-world-simd",
+)
diff --git a/bazel/hello-world/hello-world-simd.cc b/bazel/hello-world/hello-world-simd.cc
new file mode 100644
index 0000000000..649adab20a
--- /dev/null
+++ b/bazel/hello-world/hello-world-simd.cc
@@ -0,0 +1,10 @@
+#include <wasm_simd128.h>
+
+void multiply_arrays(int* out, int* in_a, int* in_b, int size) {
+  for (int i = 0; i < size; i += 4) {
+    v128_t a = wasm_v128_load(&in_a[i]);
+    v128_t b = wasm_v128_load(&in_b[i]);
+    v128_t prod = wasm_i32x4_mul(a, b);
+    wasm_v128_store(&out[i], prod);
+  }
+}
diff --git a/scripts/test_bazel.sh b/scripts/test_bazel.sh
index 67145c4fd9..4194ad76a0 100755
--- a/scripts/test_bazel.sh
+++ b/scripts/test_bazel.sh
@@ -22,3 +22,4 @@ grep ${HASH} bazel/WORKSPACE || (echo ${FAILMSG} && false)
 
 cd bazel
 bazel build //hello-world:hello-world-wasm
+bazel build --copt="-msimd128" //hello-world:hello-world-wasm-simd

From ba7fad312bd31a6fa944fa3d226370d81c3679ed Mon Sep 17 00:00:00 2001
From: walkingeyerobot <mitch@thefoley.net>
Date: Mon, 8 Feb 2021 15:34:32 -0500
Subject: [PATCH 105/161] make hello world simd a bit cleaner (#701)

---
 bazel/hello-world/BUILD | 1 +
 scripts/test_bazel.sh   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bazel/hello-world/BUILD b/bazel/hello-world/BUILD
index 1c7e087e30..07fbed5510 100644
--- a/bazel/hello-world/BUILD
+++ b/bazel/hello-world/BUILD
@@ -19,4 +19,5 @@ wasm_cc_binary(
 wasm_cc_binary(
     name = "hello-world-wasm-simd",
     cc_target = ":hello-world-simd",
+    simd = True,
 )
diff --git a/scripts/test_bazel.sh b/scripts/test_bazel.sh
index 4194ad76a0..6a2c98db52 100755
--- a/scripts/test_bazel.sh
+++ b/scripts/test_bazel.sh
@@ -22,4 +22,4 @@ grep ${HASH} bazel/WORKSPACE || (echo ${FAILMSG} && false)
 
 cd bazel
 bazel build //hello-world:hello-world-wasm
-bazel build --copt="-msimd128" //hello-world:hello-world-wasm-simd
+bazel build //hello-world:hello-world-wasm-simd

From 8b32b7def837a15e766039501630549149d3db41 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 8 Feb 2021 15:01:14 -0800
Subject: [PATCH 106/161] Cleanup handling of old prebuild SDK tags (#697)

- Remove empty llvm-tags-32bit.txt
- Remove code that executes if llvm-tags-64bit.txt is missing (it
  can't be since its checked in these days).
- Cleanup load_file_index_list

I verfied manually that llvm_precompiled_tags* list are identical
before and after this change.
---
 emsdk.py            | 33 ++++++++-------------------------
 llvm-tags-32bit.txt |  0
 llvm-tags-64bit.txt |  2 +-
 3 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 llvm-tags-32bit.txt

diff --git a/emsdk.py b/emsdk.py
index 6d30c56d2d..aff9b4cc7d 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2173,25 +2173,13 @@ def remove_suffix(s, suffix):
 
 # filename should be one of: 'llvm-precompiled-tags-32bit.txt', 'llvm-precompiled-tags-64bit.txt'
 def load_file_index_list(filename):
-  try:
-    items = open(sdk_path(filename), 'r').read().split('\n')
-    items = map(lambda x: remove_suffix(remove_suffix(remove_prefix(x, 'emscripten-llvm-e'), '.tar.gz'), '.zip').strip(), items)
-    items = filter(lambda x: 'latest' not in x and len(x) > 0, items)
-
-    # Sort versions from oldest to newest (the default sort would be lexicographic, i.e. '1.37.1 < 1.37.10 < 1.37.2')
-    items = sorted(items, key=version_key)[::-1]
-
-    return items
-  except:
-    return []
+  items = open(sdk_path(filename)).read().splitlines()
+  items = [remove_suffix(remove_suffix(remove_prefix(x, 'emscripten-llvm-e'), '.tar.gz'), '.zip').strip() for x in items]
+  items = [x for x in items if 'latest' not in x and len(x) > 0]
 
-
-def load_llvm_precompiled_tags_32bit():
-  return load_file_index_list('llvm-tags-32bit.txt')
-
-
-def load_llvm_precompiled_tags_64bit():
-  return load_file_index_list('llvm-tags-64bit.txt')
+  # Sort versions from oldest to newest (the default sort would be
+  # lexicographic, i.e. '1.37.1 < 1.37.10 < 1.37.2')
+  return sorted(items, key=version_key)
 
 
 def exit_with_error(msg):
@@ -2237,7 +2225,6 @@ def is_string(s):
 
 
 def load_sdk_manifest():
-  global tools, sdks
   try:
     manifest = json.loads(open(sdk_path("emsdk_manifest.json"), "r").read())
   except Exception as e:
@@ -2246,8 +2233,8 @@ def load_sdk_manifest():
     return
 
   emscripten_tags = load_legacy_emscripten_tags()
-  llvm_precompiled_tags_32bit = list(reversed(load_llvm_precompiled_tags_32bit()))
-  llvm_precompiled_tags_64bit = list(reversed(load_llvm_precompiled_tags_64bit()))
+  llvm_precompiled_tags_32bit = []
+  llvm_precompiled_tags_64bit = load_file_index_list('llvm-tags-64bit.txt')
   llvm_precompiled_tags = llvm_precompiled_tags_32bit + llvm_precompiled_tags_64bit
   binaryen_tags = load_legacy_binaryen_tags()
   releases_tags = load_releases_tags()
@@ -2818,10 +2805,6 @@ def extract_bool_arg(name):
 
   cmd = sys.argv[1]
 
-  # On first run when tag list is not present, populate it to bootstrap.
-  if (cmd == 'install' or cmd == 'list') and not os.path.isfile(sdk_path('llvm-tags-64bit.txt')):
-    fetch_emscripten_tags()
-
   load_dot_emscripten()
   load_sdk_manifest()
 
diff --git a/llvm-tags-32bit.txt b/llvm-tags-32bit.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/llvm-tags-64bit.txt b/llvm-tags-64bit.txt
index 0bc8cd8116..7920f38fdc 100644
--- a/llvm-tags-64bit.txt
+++ b/llvm-tags-64bit.txt
@@ -72,4 +72,4 @@ emscripten-llvm-e1.37.10.tar.gz
 emscripten-llvm-e1.37.1.tar.gz
 emscripten-llvm-e1.37.0.tar.gz
 emscripten-llvm-e1.36.14.tar.gz
-emscripten-llvm-e1.36.13.tar.gz
\ No newline at end of file
+emscripten-llvm-e1.36.13.tar.gz

From 9e96410d7fcdbcda258ac970f56a9bb87ed5bb2c Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 12 Feb 2021 16:47:20 -0800
Subject: [PATCH 107/161] Update node version to 14.15.5 (latest TLS release)
 (#708)

See https://github.com/WebAssembly/binaryen/issues/3551
---
 docker/Dockerfile      |  4 ++--
 emsdk_manifest.json    | 48 +++++++++++++++++++++---------------------
 scripts/test.bat       | 10 ++++-----
 scripts/test.py        |  6 +++---
 scripts/update_node.py |  5 +++--
 5 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 48ff1a84e9..d31e0dfd22 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -66,8 +66,8 @@ COPY --from=stage_build /emsdk /emsdk
 # (sub-stages) or with custom / no entrypoint
 ENV EMSDK=/emsdk \
     EM_CONFIG=/emsdk/.emscripten \
-    EMSDK_NODE=/emsdk/node/12.18.1_64bit/bin/node \
-    PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/upstream/bin:/emsdk/node/12.18.1_64bit/bin:${PATH}"
+    EMSDK_NODE=/emsdk/node/14.15.5_64bit/bin/node \
+    PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/upstream/bin:/emsdk/node/14.15.5_64bit/bin:${PATH}"
 
 # ------------------------------------------------------------------------------
 # Create a 'standard` 1000:1000 user
diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index bbc2fe84b3..cda3ea1c41 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -186,42 +186,42 @@
   },
   {
     "id": "node",
-    "version": "12.18.1",
+    "version": "14.15.5",
     "bitness": 32,
     "arch": "x86",
-    "windows_url": "node-v12.18.1-win-x86.zip",
+    "windows_url": "node-v14.15.5-win-x86.zip",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
     "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
   },
   {
     "id": "node",
-    "version": "12.18.1",
+    "version": "14.15.5",
     "arch": "arm",
     "bitness": 32,
-    "linux_url": "node-v12.18.1-linux-armv7l.tar.xz",
+    "linux_url": "node-v14.15.5-linux-armv7l.tar.xz",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
     "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
   },
   {
     "id": "node",
-    "version": "12.18.1",
+    "version": "14.15.5",
     "bitness": 64,
     "arch": "x86_64",
-    "macos_url": "node-v12.18.1-darwin-x64.tar.gz",
-    "windows_url": "node-v12.18.1-win-x64.zip",
-    "linux_url": "node-v12.18.1-linux-x64.tar.xz",
+    "macos_url": "node-v14.15.5-darwin-x64.tar.gz",
+    "windows_url": "node-v14.15.5-win-x64.zip",
+    "linux_url": "node-v14.15.5-linux-x64.tar.xz",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
     "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
   },
   {
     "id": "node",
-    "version": "12.18.1",
+    "version": "14.15.5",
     "arch": "aarch64",
     "bitness": 64,
-    "linux_url": "node-v12.18.1-linux-arm64.tar.xz",
+    "linux_url": "node-v14.15.5-linux-arm64.tar.xz",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
     "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
@@ -473,19 +473,19 @@
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "python-3.7.4-pywin32-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-master-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "win"
   },
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-master-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "macos"
   },
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-master-64bit", "node-14.15.5-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "linux"
   },
   {
@@ -497,31 +497,31 @@
   {
     "version": "fastcomp-master",
     "bitness": 32,
-    "uses": ["fastcomp-clang-master-32bit", "node-12.18.1-32bit", "python-3.7.4-32bit", "java-8.152-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
+    "uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "python-3.7.4-32bit", "java-8.152-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
     "os": "win"
   },
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "win"
   },
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "macos"
   },
   {
     "version": "fastcomp-master",
     "bitness": 32,
-    "uses": ["fastcomp-clang-master-32bit", "node-12.18.1-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
+    "uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
     "os": "linux"
   },
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-12.18.1-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "linux"
   },
   {
@@ -563,42 +563,42 @@
   {
     "version": "releases-upstream-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.18.1-64bit", "releases-upstream-%releases-tag%-64bit"],
+    "uses": ["node-14.15.5-64bit", "releases-upstream-%releases-tag%-64bit"],
     "os": "linux",
     "custom_install_script": "emscripten_npm_install"
   },
   {
     "version": "releases-upstream-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.18.1-64bit", "python-3.7.4-2-64bit", "releases-upstream-%releases-tag%-64bit"],
+    "uses": ["node-14.15.5-64bit", "python-3.7.4-2-64bit", "releases-upstream-%releases-tag%-64bit"],
     "os": "macos",
     "custom_install_script": "emscripten_npm_install"
   },
   {
     "version": "releases-upstream-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.18.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
+    "uses": ["node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
     "os": "win",
     "custom_install_script": "emscripten_npm_install"
   },
   {
     "version": "releases-fastcomp-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.18.1-64bit", "releases-fastcomp-%releases-tag%-64bit"],
+    "uses": ["node-14.15.5-64bit", "releases-fastcomp-%releases-tag%-64bit"],
     "os": "linux",
     "custom_install_script": "emscripten_npm_install"
   },
   {
     "version": "releases-fastcomp-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.18.1-64bit", "python-3.7.4-2-64bit", "releases-fastcomp-%releases-tag%-64bit"],
+    "uses": ["node-14.15.5-64bit", "python-3.7.4-2-64bit", "releases-fastcomp-%releases-tag%-64bit"],
     "os": "macos",
     "custom_install_script": "emscripten_npm_install"
   },
   {
     "version": "releases-fastcomp-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-12.18.1-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-fastcomp-%releases-tag%-64bit"],
+    "uses": ["node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-fastcomp-%releases-tag%-64bit"],
     "os": "win",
     "custom_install_script": "emscripten_npm_install"
   },
diff --git a/scripts/test.bat b/scripts/test.bat
index 6f8cb33a39..9fea0c1f43 100755
--- a/scripts/test.bat
+++ b/scripts/test.bat
@@ -1,7 +1,7 @@
 :: equivilent of test.sh as windows bat file
 set PATH=%PATH%;%PYTHON_BIN%
-@CALL emsdk install latest
-@CALL emsdk activate latest
-@CALL emsdk_env.bat
-@CALL python -c "import sys; print(sys.executable)"
-@CALL emcc.bat -v
+CALL emsdk install latest
+CALL emsdk activate latest
+CALL emsdk_env.bat
+CALL python -c "import sys; print(sys.executable)"
+CALL emcc.bat -v
diff --git a/scripts/test.py b/scripts/test.py
index 456a13463a..5b4d0e6f33 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -175,9 +175,9 @@ def run_emsdk(cmd):
 
 # Test the normal tools like node don't re-download on re-install
 print('another install must re-download')
-checked_call_with_output(emsdk + ' uninstall node-12.18.1-64bit')
-checked_call_with_output(emsdk + ' install node-12.18.1-64bit', expected='Downloading:', unexpected='already installed')
-checked_call_with_output(emsdk + ' install node-12.18.1-64bit', unexpected='Downloading:', expected='already installed')
+checked_call_with_output(emsdk + ' uninstall node-14.15.5-64bit')
+checked_call_with_output(emsdk + ' install node-14.15.5-64bit', expected='Downloading:', unexpected='already installed')
+checked_call_with_output(emsdk + ' install node-14.15.5-64bit', unexpected='Downloading:', expected='already installed')
 
 print('test tot-upstream')
 run_emsdk('install tot-upstream')
diff --git a/scripts/update_node.py b/scripts/update_node.py
index 765f20678d..45adce9d5d 100755
--- a/scripts/update_node.py
+++ b/scripts/update_node.py
@@ -16,8 +16,8 @@
 import os
 import shutil
 
-version = '12.18.1'
-base = 'https://nodejs.org/dist/latest-v12.x/'
+version = '14.15.5'
+base = 'https://nodejs.org/dist/latest-v14.x/'
 upload_base = 'gs://webassembly/emscripten-releases-builds/deps/'
 
 suffixes = [
@@ -40,6 +40,7 @@
       shutil.move(dirname, 'bin')
       os.mkdir(dirname)
       shutil.move('bin', dirname)
+      os.remove(filename)
       subprocess.check_call(['zip', '-rq', filename, dirname])
       shutil.rmtree(dirname)
 

From 2b720e547355182d0b78d59d269bd17561dfac2e Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Sun, 14 Feb 2021 11:46:10 -0800
Subject: [PATCH 108/161] 2.0.14 (#710)

---
 bazel/WORKSPACE              | 6 +++---
 emscripten-releases-tags.txt | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index e8c022577a..1b65941983 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -8,12 +8,12 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
 
-# emscripten 2.0.13
+# emscripten 2.0.14
 http_archive(
     name = "emscripten",
-    sha256 = "8986ed886e111c661099c5147126b8a379a4040aab6a1f572fe01f0f9b99a343",
+    sha256 = "e466cd47ddd4bf0acd645412fdf08eda6d232484e48e5a2643e08062a7a4cf56",
     strip_prefix = "install",
-    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/ce0e4a4d1cab395ee5082a60ebb4f3891a94b256/wasm-binaries.tbz2",
+    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/fc5562126762ab26c4757147a3b4c24e85a7289e/wasm-binaries.tbz2",
     build_file = "//emscripten_toolchain:emscripten.BUILD",
     type = "tar.bz2",
 )
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 61a3456fe5..051ea7b469 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.13",
+  "latest": "2.0.14",
   "releases": {
+    "2.0.14":  "fc5562126762ab26c4757147a3b4c24e85a7289e",
     "2.0.13":  "ce0e4a4d1cab395ee5082a60ebb4f3891a94b256",
     "2.0.12":  "dcf819a7821f8db0c8f15ac336fea8960ec204f5",
     "2.0.11":  "4764c5c323a474f7ba28ae991b0c9024fccca43c",

From 57ebbbdabce7dc0701a7f02d8e879c5869f70bf7 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 15 Feb 2021 13:46:54 -0800
Subject: [PATCH 109/161] Avoid adding our java or python to the PATH (#706)

For Java we use the value in the config file so it doesn't need to be in
the PATH.

For python, all our tools should launch via scripts that check for
EMSDK_PYTHON so having python in the PATH for emsdk users should not be
needed.

The motivation for this is that we don't want to clobber any existing
python or java versions that users might already have in their PATH.

This is the easy part of #705.
---
 emsdk_manifest.json         | 9 ---------
 scripts/test_activation.ps1 | 8 --------
 2 files changed, 17 deletions(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index cda3ea1c41..c27cac8228 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -232,7 +232,6 @@
     "bitness": 32,
     "arch": "x86",
     "windows_url": "WinPython-32bit-2.7.13.1Zero.zip",
-    "activated_path": "%installation_dir%/python-2.7.13",
     "activated_cfg": "PYTHON='%installation_dir%/python-2.7.13/python%.exe%'",
     "activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13/python%.exe%"
   },
@@ -242,7 +241,6 @@
     "bitness": 64,
     "arch": "x86_64",
     "windows_url": "WinPython-64bit-2.7.13.1Zero.zip",
-    "activated_path": "%installation_dir%/python-2.7.13.amd64",
     "activated_cfg": "PYTHON='%installation_dir%/python-2.7.13.amd64/python%.exe%'",
     "activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13.amd64/python%.exe%"
   },
@@ -252,7 +250,6 @@
     "bitness": 32,
     "arch": "x86",
     "windows_url": "python-3.7.4-embed-win32-patched.zip",
-    "activated_path": "%installation_dir%",
     "activated_cfg": "PYTHON='%installation_dir%/python.exe'",
     "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
   },
@@ -262,7 +259,6 @@
     "bitness": 64,
     "arch": "x86_64",
     "windows_url": "python-3.7.4-embed-amd64-patched.zip",
-    "activated_path": "%installation_dir%",
     "activated_cfg": "PYTHON='%installation_dir%/python.exe'",
     "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
   },
@@ -272,7 +268,6 @@
     "bitness": 32,
     "arch": "x86",
     "windows_url": "python-3.7.4-embed-win32+pywin32.zip",
-    "activated_path": "%installation_dir%",
     "activated_cfg": "PYTHON='%installation_dir%/python.exe'",
     "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
   },
@@ -282,7 +277,6 @@
     "bitness": 64,
     "arch": "x86_64",
     "windows_url": "python-3.7.4-embed-amd64+pywin32.zip",
-    "activated_path": "%installation_dir%",
     "activated_cfg": "PYTHON='%installation_dir%/python.exe'",
     "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
   },
@@ -292,7 +286,6 @@
     "bitness": 64,
     "arch": "x86_64",
     "macos_url": "python-3.7.4-2-macos.tar.gz",
-    "activated_path": "%installation_dir%/bin",
     "activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
     "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.7/site-packages/certifi/cacert.pem"
   },
@@ -302,7 +295,6 @@
     "bitness": 32,
     "arch": "x86",
     "windows_url": "portable_jre_8_update_152_32bit.zip",
-    "activated_path": "%installation_dir%/bin",
     "activated_env": "JAVA_HOME=%installation_dir%",
     "activated_cfg": "JAVA='%installation_dir%/bin/java%.exe%'"
   },
@@ -312,7 +304,6 @@
     "bitness": 64,
     "arch": "x86_64",
     "windows_url": "portable_jre_8_update_152_64bit.zip",
-    "activated_path": "%installation_dir%/bin",
     "activated_env": "JAVA_HOME=%installation_dir%",
     "activated_cfg": "JAVA='%installation_dir%/bin/java%.exe%'"
   },
diff --git a/scripts/test_activation.ps1 b/scripts/test_activation.ps1
index 98ebada623..82907bb162 100644
--- a/scripts/test_activation.ps1
+++ b/scripts/test_activation.ps1
@@ -65,14 +65,6 @@ try {
     if (!$EMSDK_NODE_Path) {
         throw "$repo_root\\node is not added to path."
     }
-    $EMSDK_PYTHON_Path = $path_split | Where-Object { $_ -like "$repo_root\python*" }
-    if (!$EMSDK_PYTHON_Path) {
-        throw "$repo_root\\python is not added to path."
-    }
-    $EMSDK_JAVA_Path = $path_split | Where-Object { $_ -like "$repo_root\java*" }
-    if (!$EMSDK_JAVA_Path) {
-        throw "$repo_root\\java is not added to path."
-    }
 
     $EMSDK_UPSTREAM_Path = $path_split | Where-Object { $_ -like "$repo_root\upstream\emscripten*" }
     if (!$EMSDK_UPSTREAM_Path) {

From ef638b3860d7856d51c42b981714ee1da11bafd2 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Wed, 17 Feb 2021 19:11:07 -0800
Subject: [PATCH 110/161] Rename llvm-git-master -> llvm-git-main (#718)

To match the branch rename that happened in #693.
---
 emsdk_manifest.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index c27cac8228..1c3c0348d3 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -2,7 +2,7 @@
   "tools": [
   {
     "id": "llvm-git",
-    "version": "master",
+    "version": "main",
     "bitness": 32,
     "install_path": "llvm/git",
     "git_branch": "main",
@@ -16,7 +16,7 @@
   },
   {
     "id": "llvm-git",
-    "version": "master",
+    "version": "main",
     "bitness": 64,
     "install_path": "llvm/git",
     "git_branch": "main",
@@ -464,25 +464,25 @@
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-master-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "win"
   },
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-master-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "macos"
   },
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-master-64bit", "node-14.15.5-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
     "os": "linux"
   },
   {
     "version": "upstream-master",
     "bitness": 32,
-    "uses": ["llvm-git-master-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
+    "uses": ["llvm-git-main-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
     "os": "linux"
   },
   {

From 63b6cd2a4e122f86b4d76d371eed978debf85d0f Mon Sep 17 00:00:00 2001
From: Jia Yuan Lo <jylo06g@gmail.com>
Date: Wed, 24 Feb 2021 03:18:28 +0800
Subject: [PATCH 111/161] Allow system npm in "emsdk install emscripten" (#723)

"emsdk install emscripten-master-64bit" is currently dependent on
whether emscripten node is installed or not.

This change allow using system-provided node / npm command to proceed
the installation. Also clarify the error message.
---
 emsdk.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index aff9b4cc7d..6676607109 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -1243,10 +1243,16 @@ def find_latest_installed_tool(name):
 def emscripten_npm_install(tool, directory):
   node_tool = find_latest_installed_tool('node')
   if not node_tool:
-    print('Failed to run "npm ci" in installed Emscripten root directory ' + tool.installation_path() + '! Please install node.js first!')
-    return False
+    npm_fallback = which('npm')
+    if not npm_fallback:
+      print('Failed to find npm command!')
+      print('Running "npm ci" in installed Emscripten root directory ' + tool.installation_path() + ' is required!')
+      print('Please install node.js first!')
+      return False
+    node_path = os.path.dirname(npm_fallback)
+  else:
+    node_path = os.path.join(node_tool.installation_path(), 'bin')
 
-  node_path = os.path.join(node_tool.installation_path(), 'bin')
   npm = os.path.join(node_path, 'npm' + ('.cmd' if WINDOWS else ''))
   env = os.environ.copy()
   env["PATH"] = node_path + os.pathsep + env["PATH"]

From 102e02252b94a7fbcb918f504831a27070a4bfda Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 25 Feb 2021 16:34:56 -0800
Subject: [PATCH 112/161] Move error reporting when git is not found during
 update-tags (#728)

update-tags is called from two places `update-tags` itself and also
as as part of `update`.   Silently ignoring the absence of git should
only happen in the later case.   If the user explicitly ask for
update-tags we should hard fail as normal.
---
 emsdk.py | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 6676607109..82f3309ef4 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2113,24 +2113,10 @@ def python_2_3_sorted(arr, cmp):
     return sorted(arr, cmp=cmp)
 
 
-def fetch_emscripten_tags():
-  git = GIT(must_succeed=False)
-
-  if git:
-    print('Fetching emscripten-releases repository...')
-    emscripten_releases_tot = get_emscripten_releases_tot()
-    open(tot_path(), 'w').write(emscripten_releases_tot)
-  else:
-    print('Update complete, however skipped fetching the Emscripten tags, since git was not found, which is necessary for update-tags.')
-    if WINDOWS:
-      print("Please install git by typing 'emsdk install git-1.9.4', or alternatively by installing it manually from http://git-scm.com/downloads . If you install git manually, remember to add it to PATH.")
-    elif MACOS:
-      print("Please install git from http://git-scm.com/ , or by installing XCode and then the XCode Command Line Tools (see http://stackoverflow.com/questions/9329243/xcode-4-4-command-line-tools ).")
-    elif LINUX:
-      print("Pease install git using your package manager, see http://git-scm.com/book/en/Getting-Started-Installing-Git .")
-    else:
-      print("Please install git.")
-    return
+def update_tags():
+  print('Fetching emscripten-releases repository...')
+  emscripten_releases_tot = get_emscripten_releases_tot()
+  open(tot_path(), 'w').write(emscripten_releases_tot)
 
 
 def is_emsdk_sourced_from_github():
@@ -2144,7 +2130,18 @@ def update_emsdk():
     sys.exit(1)
   if not download_and_unzip(emsdk_zip_download_url, emsdk_path(), download_even_if_exists=True, clobber=False):
     sys.exit(1)
-  fetch_emscripten_tags()
+  if not GIT(must_succeed=False):
+    print('Update complete, however skipped update-tags, since git was not found.')
+    if WINDOWS:
+      print("Please install git by typing 'emsdk install git-1.9.4', or alternatively by installing it manually from http://git-scm.com/downloads . If you install git manually, remember to add it to PATH.")
+    elif MACOS:
+      print("Please install git from http://git-scm.com/ , or by installing XCode and then the XCode Command Line Tools (see http://stackoverflow.com/questions/9329243/xcode-4-4-command-line-tools ).")
+    elif LINUX:
+      print("Pease install git using your package manager, see http://git-scm.com/book/en/Getting-Started-Installing-Git .")
+    else:
+      print("Please install git.")
+    return
+  update_tags()
 
 
 # Lists all legacy (pre-emscripten-releases) tagged versions directly in the Git
@@ -2987,7 +2984,7 @@ def print_tools(t):
       rmfile(sdk_path(EMSDK_SET_ENV))
     return 0
   elif cmd == 'update-tags':
-    fetch_emscripten_tags()
+    update_tags()
     return 0
   elif cmd == 'activate':
     if arg_permanent:

From f9af08a28f9c48a48041398237ec45c598888b68 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 25 Feb 2021 16:35:38 -0800
Subject: [PATCH 113/161] Remove unused run_emcc function. NFC. (#713)

Also, make handling of activated_path consistent.  We don't support
multiple activated paths so we can simplify the handling in some
places.
---
 emsdk.py | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 82f3309ef4..35783c15a8 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -1722,6 +1722,8 @@ def is_installed(self, skip_version_check=False):
       # This tool does not contain downloadable elements, so it is installed by default.
       return True
 
+    content_exists = os.path.exists(self.installation_path()) and (os.path.isfile(self.installation_path()) or num_files_in_directory(self.installation_path()) > 0)
+
     # For e.g. fastcomp clang from git repo, the activated PATH is the
     # directory where the compiler is built to, and installation_path is
     # the directory where the source tree exists. To distinguish between
@@ -1729,15 +1731,8 @@ def is_installed(self, skip_version_check=False):
     # clang-master-64bit, clang-master-32bit and clang-master-64bit each
     # share the same git repo), require that in addition to the installation
     # directory, each item in the activated PATH must exist.
-    if hasattr(self, 'activated_path'):
-      activated_path = self.expand_vars(self.activated_path).split(';')
-    else:
-      activated_path = [self.installation_path()]
-
-    def each_path_exists(pathlist):
-      return all(os.path.exists(p) for p in pathlist)
-
-    content_exists = os.path.exists(self.installation_path()) and each_path_exists(activated_path) and (os.path.isfile(self.installation_path()) or num_files_in_directory(self.installation_path()) > 0)
+    if hasattr(self, 'activated_path') and not os.path.exists(self.expand_vars(self.activated_path)):
+      content_exists = False
 
     # vs-tool is a special tool since all versions must be installed to the
     # same dir, so dir name will not differentiate the version.
@@ -1797,8 +1792,7 @@ def is_env_active(self):
         return False
 
     if hasattr(self, 'activated_path'):
-      path = self.expand_vars(self.activated_path).replace('\\', '/')
-      path = path.split(ENVPATH_SEPARATOR)
+      path = to_unix_path(self.expand_vars(self.activated_path))
       for p in path:
         path_items = os.environ['PATH'].replace('\\', '/').split(ENVPATH_SEPARATOR)
         if not normalized_contains(path_items, p):
@@ -2397,18 +2391,6 @@ def process_tool_list(tools_to_activate, log_errors=True):
   return tools_to_activate
 
 
-def run_emcc(tools_to_activate):
-  for tool in tools_to_activate:
-    activated_path = getattr(tool, 'activated_path', None)
-    if activated_path and activated_path.endswith('/emscripten'):
-      activated_path = to_native_path(tool.expand_vars(tool.activated_path))
-      emcc_path = os.path.join(activated_path, 'emcc.py')
-      if os.path.exists(emcc_path):
-        debug_print('Calling emcc to initialize it')
-        subprocess.call([sys.executable, emcc_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        return
-
-
 def write_set_env_script(env_string):
   assert(WINDOWS)
   open(EMSDK_SET_ENV, 'w').write(env_string)

From a79eadf89335daa24f749ac9a9d405b9a7ad3836 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 26 Feb 2021 08:48:00 -0800
Subject: [PATCH 114/161] Fix crash attempting to install fastcmp SDK by hash
 (#730)

Using the full SDK name was causing a crash here because the
version is not of the form 1.2.3.  e.g:

sdk-releases-upstream-3b8cff670e9233a6623563add831647e8689a86b-64bit
---
 emsdk.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 35783c15a8..0063bcb6a1 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2625,14 +2625,14 @@ def expand_sdk_name(name):
     elif '-fastcomp' in fullname:
       fullname = fullname.replace('-fastcomp', '')
       backend = 'fastcomp'
-    fullname = fullname.replace('sdk-', '').replace('-64bit', '').replace('tag-', '')
-    if backend == 'fastcomp' and version_key(fullname) >= (2, 0, 0):
-      exit_with_fastcomp_error()
+    version = fullname.replace('sdk-', '').replace('releases-', '').replace('-64bit', '').replace('tag-', '')
     releases_info = load_releases_info()['releases']
-    release_hash = get_release_hash(fullname, releases_info)
+    release_hash = get_release_hash(version, releases_info)
     if release_hash:
+      if backend == 'fastcomp' and version_key(version) >= (2, 0, 0):
+        exit_with_fastcomp_error()
       if backend is None:
-        if version_key(fullname) >= (1, 39, 0):
+        if version_key(version) >= (1, 39, 0):
           backend = 'upstream'
         else:
           backend = 'fastcomp'

From fcf1bbe97431c81005e306929e8fbedc6878e613 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 26 Feb 2021 08:49:08 -0800
Subject: [PATCH 115/161] Limit expansion of %releases-tag% for fastcomp (#731)

Without this, all releases are made available as fastcomp
versions.

Also, sort the releases to that the most recent come last.
This fixes the `emsdk list` display which only displays
the two most recent versions.
---
 emsdk.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 0063bcb6a1..ac3307dae9 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2199,14 +2199,22 @@ def load_releases_info():
 
 # Get a list of tags for emscripten-releases.
 def load_releases_tags():
+  tags = []
+  tags_fastcomp = []
   info = load_releases_info()
-  tags = list(info['releases'].values())
+  for version, sha in sorted(info['releases'].items(), key=lambda x: version_key(x[0])):
+    tags.append(sha)
+    # Only include versions older than 1.39.0 in fastcomp releases
+    if version_key(version) < (2, 0, 0):
+      tags_fastcomp.append(sha)
+
   # Add the tip-of-tree, if it exists.
   if os.path.exists(tot_path()):
     tot = find_tot()
     if tot:
       tags.append(tot)
-  return tags
+
+  return tags, tags_fastcomp
 
 
 def load_releases_versions():
@@ -2234,7 +2242,7 @@ def load_sdk_manifest():
   llvm_precompiled_tags_64bit = load_file_index_list('llvm-tags-64bit.txt')
   llvm_precompiled_tags = llvm_precompiled_tags_32bit + llvm_precompiled_tags_64bit
   binaryen_tags = load_legacy_binaryen_tags()
-  releases_tags = load_releases_tags()
+  releases_tags, releases_tags_fastcomp = load_releases_tags()
 
   def dependencies_exist(sdk):
     for tool_name in sdk.uses:
@@ -2317,6 +2325,8 @@ def expand_category_param(param, category_list, t, is_sdk):
         expand_category_param('%precompiled_tag64%', llvm_precompiled_tags_64bit, t, is_sdk=False)
       elif '%binaryen_tag%' in t.version:
         expand_category_param('%binaryen_tag%', binaryen_tags, t, is_sdk=False)
+      elif '%releases-tag%' in t.version and 'fastcomp' in t.version:
+        expand_category_param('%releases-tag%', releases_tags_fastcomp, t, is_sdk=False)
       elif '%releases-tag%' in t.version:
         expand_category_param('%releases-tag%', releases_tags, t, is_sdk=False)
       else:
@@ -2337,6 +2347,8 @@ def expand_category_param(param, category_list, t, is_sdk):
         expand_category_param('%precompiled_tag32%', llvm_precompiled_tags_32bit, sdk, is_sdk=True)
       elif '%precompiled_tag64%' in sdk.version:
         expand_category_param('%precompiled_tag64%', llvm_precompiled_tags_64bit, sdk, is_sdk=True)
+      elif '%releases-tag%' in sdk.version and 'fastcomp' in sdk.version:
+        expand_category_param('%releases-tag%', releases_tags_fastcomp, sdk, is_sdk=True)
       elif '%releases-tag%' in sdk.version:
         expand_category_param('%releases-tag%', releases_tags, sdk, is_sdk=True)
       else:

From c1883c7407ef071b5b3ad6b8ef6fab3267e1346b Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 26 Feb 2021 08:52:07 -0800
Subject: [PATCH 116/161] Cleanup sys.argv handling. NFC. (#734)

---
 emsdk.py | 97 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 47 insertions(+), 50 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index ac3307dae9..ed560eefe3 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -834,7 +834,6 @@ def git_clone_checkout_and_pull(url, dstpath, branch):
 # Each tool can have its own build type, or it can be overridden on the command
 # line.
 def decide_cmake_build_type(tool):
-  global CMAKE_BUILD_TYPE_OVERRIDE
   if CMAKE_BUILD_TYPE_OVERRIDE:
     return CMAKE_BUILD_TYPE_OVERRIDE
   else:
@@ -953,7 +952,6 @@ def find_msbuild(sln_file):
 
 def make_build(build_root, build_type, build_target_platform='x64'):
   debug_print('make_build(build_root=' + build_root + ', build_type=' + build_type + ', build_target_platform=' + build_target_platform + ')')
-  global CPU_CORES
   if CPU_CORES > 1:
     print('Performing a parallel build with ' + str(CPU_CORES) + ' cores.')
   else:
@@ -1100,7 +1098,6 @@ def build_fastcomp(tool):
   build_type = decide_cmake_build_type(tool)
 
   # Configure
-  global BUILD_FOR_TESTING, ENABLE_LLVM_ASSERTIONS
   tests_arg = 'ON' if BUILD_FOR_TESTING else 'OFF'
 
   enable_assertions = ENABLE_LLVM_ASSERTIONS.lower() == 'on' or (ENABLE_LLVM_ASSERTIONS == 'auto' and build_type.lower() != 'release' and build_type.lower() != 'minsizerel')
@@ -1156,7 +1153,6 @@ def build_llvm(tool):
   build_type = decide_cmake_build_type(tool)
 
   # Configure
-  global BUILD_FOR_TESTING, ENABLE_LLVM_ASSERTIONS
   tests_arg = 'ON' if BUILD_FOR_TESTING else 'OFF'
 
   enable_assertions = ENABLE_LLVM_ASSERTIONS.lower() == 'on' or (ENABLE_LLVM_ASSERTIONS == 'auto' and build_type.lower() != 'release' and build_type.lower() != 'minsizerel')
@@ -2652,13 +2648,14 @@ def expand_sdk_name(name):
   return name
 
 
-def main():
-  global BUILD_FOR_TESTING, ENABLE_LLVM_ASSERTIONS, TTY_OUTPUT
-
-  if len(sys.argv) <= 1:
+def main(args):
+  if not args:
     errlog("Missing command; Type 'emsdk help' to get a list of commands.")
     return 1
-  if sys.argv[1] in ('help', '--help', '-h'):
+
+  cmd = args.pop(0)
+
+  if cmd in ('help', '--help', '-h'):
     print(' emsdk: Available commands:')
 
     print('''
@@ -2774,11 +2771,12 @@ def main():
        which in and RelWithDebInfo.''')
     return 0
 
-  # Extracts a boolean command line argument from sys.argv and returns True if it was present
+  # Extracts a boolean command line argument from args and returns True if it was present
   def extract_bool_arg(name):
-    old_argv = sys.argv
-    sys.argv = list(filter(lambda a: a != name, sys.argv))
-    return len(sys.argv) != len(old_argv)
+    if name in args:
+      args.remove(name)
+      return True
+    return False
 
   arg_old = extract_bool_arg('--old')
   arg_uses = extract_bool_arg('--uses')
@@ -2798,26 +2796,25 @@ def extract_bool_arg(name):
 
   arg_notty = extract_bool_arg('--notty')
   if arg_notty:
+    global TTY_OUTPUT
     TTY_OUTPUT = False
 
-  cmd = sys.argv[1]
-
   load_dot_emscripten()
   load_sdk_manifest()
 
   # Process global args
-  for i in range(2, len(sys.argv)):
-    if sys.argv[i].startswith('--generator='):
-      build_generator = re.match(r'''^--generator=['"]?([^'"]+)['"]?$''', sys.argv[i])
+  for i in range(len(args)):
+    if args[i].startswith('--generator='):
+      build_generator = re.match(r'''^--generator=['"]?([^'"]+)['"]?$''', args[i])
       if build_generator:
         global CMAKE_GENERATOR
         CMAKE_GENERATOR = build_generator.group(1)
-        sys.argv[i] = ''
+        args[i] = ''
       else:
-        errlog("Cannot parse CMake generator string: " + sys.argv[i] + ". Try wrapping generator string with quotes")
+        errlog("Cannot parse CMake generator string: " + args[i] + ". Try wrapping generator string with quotes")
         return 1
-    elif sys.argv[i].startswith('--build='):
-      build_type = re.match(r'^--build=(.+)$', sys.argv[i])
+    elif args[i].startswith('--build='):
+      build_type = re.match(r'^--build=(.+)$', args[i])
       if build_type:
         global CMAKE_BUILD_TYPE_OVERRIDE
         build_type = build_type.group(1)
@@ -2825,19 +2822,18 @@ def extract_bool_arg(name):
         try:
           build_type_index = [x.lower() for x in build_types].index(build_type.lower())
           CMAKE_BUILD_TYPE_OVERRIDE = build_types[build_type_index]
-          sys.argv[i] = ''
+          args[i] = ''
         except:
           errlog('Unknown CMake build type "' + build_type + '" specified! Please specify one of ' + str(build_types))
           return 1
       else:
-        errlog("Invalid command line parameter " + sys.argv[i] + ' specified!')
+        errlog("Invalid command line parameter " + args[i] + ' specified!')
         return 1
-  sys.argv = [x for x in sys.argv if not len(x) == 0]
+  args = [x for x in args if x]
 
   # Replace meta-packages with the real package names.
   if cmd in ('update', 'install', 'activate'):
-    for i in range(2, len(sys.argv)):
-      sys.argv[i] = expand_sdk_name(sys.argv[i])
+    args = [expand_sdk_name(a) for a in args]
 
   if cmd == 'list':
     print('')
@@ -2986,7 +2982,7 @@ def print_tools(t):
       print('')
 
     tools_to_activate = currently_active_tools()
-    args = [x for x in sys.argv[2:] if not x.startswith('--')]
+    args = [x for x in args if not x.startswith('--')]
     for arg in args:
       tool = find_tool(arg)
       if tool is None:
@@ -3005,35 +3001,36 @@ def print_tools(t):
       errlog('The changes made to environment variables only apply to the currently running shell instance. Use the \'emsdk_env.bat\' to re-enter this environment later, or if you\'d like to permanently register this environment permanently, rerun this command with the option --permanent.')
     return 0
   elif cmd == 'install':
+    global BUILD_FOR_TESTING, ENABLE_LLVM_ASSERTIONS, CPU_CORES, GIT_CLONE_SHALLOW
+
     # Process args
-    for i in range(2, len(sys.argv)):
-      if sys.argv[i].startswith('-j'):
-        multicore = re.match(r'^-j(\d+)$', sys.argv[i])
+    for i in range(len(args)):
+      if args[i].startswith('-j'):
+        multicore = re.match(r'^-j(\d+)$', args[i])
         if multicore:
-          global CPU_CORES
           CPU_CORES = int(multicore.group(1))
-          sys.argv[i] = ''
+          args[i] = ''
         else:
-          errlog("Invalid command line parameter " + sys.argv[i] + ' specified!')
+          errlog("Invalid command line parameter " + args[i] + ' specified!')
           return 1
-      elif sys.argv[i] == '--shallow':
-        global GIT_CLONE_SHALLOW
+      elif args[i] == '--shallow':
         GIT_CLONE_SHALLOW = True
-        sys.argv[i] = ''
-      elif sys.argv[i] == '--build-tests':
+        args[i] = ''
+      elif args[i] == '--build-tests':
         BUILD_FOR_TESTING = True
-        sys.argv[i] = ''
-      elif sys.argv[i] == '--enable-assertions':
+        args[i] = ''
+      elif args[i] == '--enable-assertions':
         ENABLE_LLVM_ASSERTIONS = 'ON'
-        sys.argv[i] = ''
-      elif sys.argv[i] == '--disable-assertions':
+        args[i] = ''
+      elif args[i] == '--disable-assertions':
         ENABLE_LLVM_ASSERTIONS = 'OFF'
-        sys.argv[i] = ''
-    sys.argv = [x for x in sys.argv if not len(x) == 0]
-    if len(sys.argv) <= 2:
+        args[i] = ''
+    args = [x for x in args if x]
+    if not args:
       errlog("Missing parameter. Type 'emsdk install <tool name>' to install a tool or an SDK. Type 'emsdk list' to obtain a list of available tools. Type 'emsdk install latest' to automatically install the newest version of the SDK.")
       return 1
-    for t in sys.argv[2:]:
+
+    for t in args:
       tool = find_tool(t)
       if tool is None:
         tool = find_sdk(t)
@@ -3044,12 +3041,12 @@ def print_tools(t):
         return 1
     return 0
   elif cmd == 'uninstall':
-    if len(sys.argv) <= 2:
+    if not args:
       errlog("Syntax error. Call 'emsdk uninstall <tool name>'. Call 'emsdk list' to obtain a list of available tools.")
       return 1
-    tool = find_tool(sys.argv[2])
+    tool = find_tool(args[0])
     if tool is None:
-      errlog("Error: Tool by name '" + sys.argv[2] + "' was not found.")
+      errlog("Error: Tool by name '" + args[0] + "' was not found.")
       return 1
     tool.uninstall()
     return 0
@@ -3059,4 +3056,4 @@ def print_tools(t):
 
 
 if __name__ == '__main__':
-  sys.exit(main())
+  sys.exit(main(sys.argv[1:]))

From f788ca92083e5f27a5adcfc375549756b95a89ce Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 26 Feb 2021 11:12:04 -0800
Subject: [PATCH 117/161] Remove unneeded try/catch (#733)

---
 .dockerignore |  1 -
 emsdk.py      | 10 ++--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index e7bc7c398c..dfeb00e532 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -18,5 +18,4 @@
 .emscripten_sanity_wasm
 .flake8
 emscripten-releases-tot.txt
-legacy-*-tags.txt
 README.md
diff --git a/emsdk.py b/emsdk.py
index ed560eefe3..93463c4fc4 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2137,17 +2137,11 @@ def update_emsdk():
 # Lists all legacy (pre-emscripten-releases) tagged versions directly in the Git
 # repositories. These we can pull and compile from source.
 def load_legacy_emscripten_tags():
-  try:
-    return open(sdk_path('legacy-emscripten-tags.txt'), 'r').read().split('\n')
-  except:
-    return []
+  return open(sdk_path('legacy-emscripten-tags.txt'), 'r').read().split('\n')
 
 
 def load_legacy_binaryen_tags():
-  try:
-    return open(sdk_path('legacy-binaryen-tags.txt'), 'r').read().split('\n')
-  except:
-    return []
+  return open(sdk_path('legacy-binaryen-tags.txt'), 'r').read().split('\n')
 
 
 def remove_prefix(s, prefix):

From 0a841562dfc0269d3d33b58160bf056d25c96f81 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 1 Mar 2021 09:32:07 -0800
Subject: [PATCH 118/161] Avoid post-install when nothing is installed (#736)

This avoids re-running the post-install scripts when commands such as
`./emsdk install latest` a re-run.  This re-running of npm ci can be
significant slowdown especially during testing and developerment.

Becuase of the refactoring this change change also means we exit ealier
when a given tool fails to install.  In general we want to error out as
early as possible on the first failure so as not to bury it.
---
 emsdk.py            | 96 ++++++++++++++++++++++++---------------------
 emsdk_manifest.json |  2 +-
 2 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 93463c4fc4..f1f8c127af 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -1828,9 +1828,11 @@ def download_url(self):
       return None
 
   def install(self):
+    """Returns True if the Tool was installed of False if was skipped due to
+    already being installed.
+    """
     if self.can_be_installed() is not True:
-      print("The tool '" + str(self) + "' is not available due to the reason: " + self.can_be_installed())
-      return False
+      exit_with_error("The tool '" + str(self) + "' is not available due to the reason: " + self.can_be_installed())
 
     if self.id == 'sdk':
       return self.install_sdk()
@@ -1838,33 +1840,42 @@ def install(self):
       return self.install_tool()
 
   def install_sdk(self):
+    """Returns True if any SDK component was installed of False all componented
+    were already installed.
+    """
     print("Installing SDK '" + str(self) + "'..")
+    installed = False
 
     for tool_name in self.uses:
       tool = find_tool(tool_name)
       if tool is None:
-        print("Manifest error: No tool by name '" + tool_name + "' found! This may indicate an internal SDK error!")
-      success = tool.install()
-      if not success:
-        return False
+        exit_with_error("Manifest error: No tool by name '" + tool_name + "' found! This may indicate an internal SDK error!")
+      installed |= tool.install()
+
+    if not installed:
+      print("All SDK components already installed: '" + str(self) + "'.")
+      return False
+
     if getattr(self, 'custom_install_script', None) == 'emscripten_npm_install':
       # upstream tools have hardcoded paths that are not stored in emsdk_manifest.json registry
       install_path = 'upstream' if 'releases-upstream' in self.version else 'fastcomp'
-      success = emscripten_npm_install(self, os.path.join(emsdk_path(), install_path, 'emscripten'))
-      if not success:
-        return False
+      if not emscripten_npm_install(self, os.path.join(emsdk_path(), install_path, 'emscripten')):
+        exit_with_error('post-install step failed: emscripten_npm_install')
 
     print("Done installing SDK '" + str(self) + "'.")
     return True
 
   def install_tool(self):
+    """Returns True if the SDK was installed of False if was skipped due to
+    already being installed.
+    """
     # Avoid doing a redundant reinstall of the tool, if it has already been installed.
     # However all tools that are sourced directly from git branches do need to be
     # installed every time when requested, since the install step is then used to git
     # pull the tool to a newer version.
     if self.is_installed() and not hasattr(self, 'git_branch'):
       print("Skipped installing " + self.name + ", already installed.")
-      return True
+      return False
 
     print("Installing tool '" + str(self) + "'..")
     url = self.download_url()
@@ -1892,45 +1903,44 @@ def install_tool(self):
       else:
         success = False
 
-    if success:
-      if hasattr(self, 'custom_install_script'):
-        if self.custom_install_script == 'emscripten_post_install':
-          success = emscripten_post_install(self)
-        elif self.custom_install_script == 'emscripten_npm_install':
-          success = emscripten_npm_install(self, self.installation_path())
-        elif self.custom_install_script in ('build_fastcomp', 'build_llvm'):
-          # 'build_fastcomp' is a special one that does the download on its
-          # own, others do the download manually.
-          pass
-        elif self.custom_install_script == 'build_binaryen':
-          success = build_binaryen_tool(self)
-        else:
-          raise Exception('Unknown custom_install_script command "' + self.custom_install_script + '"!')
-
-      # Install an emscripten-version.txt file if told to, and if there is one.
-      # (If this is not an actual release, but some other build, then we do not
-      # write anything.)
-      if hasattr(self, 'emscripten_releases_hash'):
-        emscripten_version_file_path = os.path.join(to_native_path(self.expand_vars(self.activated_path)), 'emscripten-version.txt')
-        version = get_emscripten_release_version(self.emscripten_releases_hash)
-        if version:
-          open(emscripten_version_file_path, 'w').write('"%s"' % version)
+    if not success:
+      exit_with_error("Installation failed!")
+
+    if hasattr(self, 'custom_install_script'):
+      if self.custom_install_script == 'emscripten_post_install':
+        success = emscripten_post_install(self)
+      elif self.custom_install_script == 'emscripten_npm_install':
+        success = emscripten_npm_install(self, self.installation_path())
+      elif self.custom_install_script in ('build_fastcomp', 'build_llvm'):
+        # 'build_fastcomp' is a special one that does the download on its
+        # own, others do the download manually.
+        pass
+      elif self.custom_install_script == 'build_binaryen':
+        success = build_binaryen_tool(self)
+      else:
+        raise Exception('Unknown custom_install_script command "' + self.custom_install_script + '"!')
 
     if not success:
-      print("Installation failed!")
-      return False
+      exit_with_error("Installation failed!")
+
+    # Install an emscripten-version.txt file if told to, and if there is one.
+    # (If this is not an actual release, but some other build, then we do not
+    # write anything.)
+    if hasattr(self, 'emscripten_releases_hash'):
+      emscripten_version_file_path = os.path.join(to_native_path(self.expand_vars(self.activated_path)), 'emscripten-version.txt')
+      version = get_emscripten_release_version(self.emscripten_releases_hash)
+      if version:
+        open(emscripten_version_file_path, 'w').write('"%s"' % version)
 
     print("Done installing tool '" + str(self) + "'.")
 
     # Sanity check that the installation succeeded, and if so, remove unneeded
     # leftover installation files.
-    if self.is_installed(skip_version_check=True):
-      self.cleanup_temp_install_files()
-      self.update_installed_version()
-    else:
-      print("Installation of '" + str(self) + "' failed, but no error was detected. Either something went wrong with the installation, or this may indicate an internal emsdk error.")
-      return False
+    if not self.is_installed(skip_version_check=True):
+      exit_with_error("Installation of '" + str(self) + "' failed, but no error was detected. Either something went wrong with the installation, or this may indicate an internal emsdk error.")
 
+    self.cleanup_temp_install_files()
+    self.update_installed_version()
     return True
 
   def cleanup_temp_install_files(self):
@@ -3030,9 +3040,7 @@ def print_tools(t):
         tool = find_sdk(t)
       if tool is None:
         return error_on_missing_tool(t)
-      success = tool.install()
-      if not success:
-        return 1
+      tool.install()
     return 0
   elif cmd == 'uninstall':
     if not args:
diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 1c3c0348d3..0457c865ce 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -550,7 +550,7 @@
     "version_filter": [
       ["%tag%", ">", "1.37.22"]
     ]
-  },  
+  },
   {
     "version": "releases-upstream-%releases-tag%",
     "bitness": 64,

From e08c1530935c292dc0f0166cf3ad8afbf547401a Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 1 Mar 2021 10:04:19 -0800
Subject: [PATCH 119/161] Refactor test.py to use python unittest. NFC. (#735)

---
 scripts/test.py | 257 +++++++++++++++++++++++++++---------------------
 1 file changed, 143 insertions(+), 114 deletions(-)

diff --git a/scripts/test.py b/scripts/test.py
index 5b4d0e6f33..f9248797df 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -5,14 +5,13 @@
 import subprocess
 import sys
 import tempfile
+import unittest
 
 WINDOWS = sys.platform.startswith('win')
 MACOS = sys.platform == 'darwin'
 
 assert 'EM_CONFIG' in os.environ, "emsdk should be activated before running this script"
 
-LIBC = os.environ['EM_CACHE'] + '/wasm/libc.a'
-
 # Remove the EM_CACHE environment variable.  It interferes with testing since
 # it would otherwise be fixed for the duration of the script and we expect
 # "emsdk activate" to be able switch between SDKs during the running of this
@@ -76,47 +75,27 @@ def failing_call_with_output(cmd, expected):
 
 
 def hack_emsdk(marker, replacement):
-  src = open('emsdk.py').read()
+  with open('emsdk.py') as f:
+    src = f.read()
   assert marker in src
   src = src.replace(marker, replacement)
   name = '__test_emsdk'
-  open(name, 'w').write(src)
+  with open(name, 'w') as f:
+    f.write(src)
   return name
 
 
 # Set up
 
-open('hello_world.c', 'w').write('''\
-#include <stdio.h>
-
-int main() {
-   printf("Hello, world!\\n");
-   return 0;
-}
-''')
-
 TAGS = json.loads(open('emscripten-releases-tags.txt').read())
 
 # Tests
 
-print('test .emscripten contents (latest was installed/activated in test.sh)')
-assert 'fastcomp' not in open(emconfig).read()
-assert 'upstream' in open(emconfig).read()
-
-# Test we don't re-download unnecessarily
-checked_call_with_output(emsdk + ' install latest', expected='already installed', unexpected='Downloading:')
 
-# Test we report installed tools properly. The latest version should be
-# installed, but not some random old one.
-checked_call_with_output(emsdk + ' list', expected=TAGS['latest'] + '    INSTALLED', unexpected='1.39.15    INSTALLED:')
-
-print('building proper system libraries')
-
-
-def test_lib_building(emcc):
+def do_lib_building(emcc):
   cache_building_messages = ['generating system library: ']
 
-  def test_build(args, expected):
+  def do_build(args, expected):
     if expected:
       expected = cache_building_messages
       unexpected = []
@@ -130,11 +109,11 @@ def test_build(args, expected):
 
   # The emsdk ships all system libraries so we don't expect to see any
   # cache population unless we explicly --clear-cache.
-  test_build('', expected=False)
+  do_build('', expected=False)
   check_call(emcc + ' --clear-cache')
-  test_build(' -O2', expected=True)
-  test_build(' -s WASM=0', expected=False)
-  test_build(' -O2 -s WASM=0', expected=False)
+  do_build(' -O2', expected=True)
+  do_build(' -s WASM=0', expected=False)
+  do_build(' -O2 -s WASM=0', expected=False)
 
 
 def run_emsdk(cmd):
@@ -143,87 +122,137 @@ def run_emsdk(cmd):
   check_call([emsdk] + cmd)
 
 
-test_lib_building(upstream_emcc)
-
-print('update')
-run_emsdk('update-tags')
-
-print('test the last fastcomp release')
-run_emsdk('install 1.40.1-fastcomp')
-run_emsdk('activate 1.40.1-fastcomp')
-
-test_lib_building(fastcomp_emcc)
-assert open(emconfig).read().count('LLVM_ROOT') == 1
-assert 'upstream' not in open(emconfig).read()
-assert 'fastcomp' in open(emconfig).read()
-
-print('verify latest fastcomp version is fixed at 1.40.1')
-checked_call_with_output(fastcomp_emcc + ' -v', '1.40.1', stderr=subprocess.STDOUT)
-
-print('verify that attempting to use newer fastcomp gives an error')
-fastcomp_error = 'The fastcomp backend is not getting new builds or releases. Please use the upstream llvm backend or use an older version than 2.0.0 (such as 1.40.1).'
-failing_call_with_output(emsdk + ' install latest-fastcomp', fastcomp_error)
-failing_call_with_output(emsdk + ' install tot-fastcomp', fastcomp_error)
-failing_call_with_output(emsdk + ' install 2.0.0-fastcomp', fastcomp_error)
-
-print('go back to using upstream')
-run_emsdk('activate latest')
-
-print('clear cache')
-check_call(upstream_emcc + ' --clear-cache')
-assert not os.path.exists(LIBC)
-
-# Test the normal tools like node don't re-download on re-install
-print('another install must re-download')
-checked_call_with_output(emsdk + ' uninstall node-14.15.5-64bit')
-checked_call_with_output(emsdk + ' install node-14.15.5-64bit', expected='Downloading:', unexpected='already installed')
-checked_call_with_output(emsdk + ' install node-14.15.5-64bit', unexpected='Downloading:', expected='already installed')
-
-print('test tot-upstream')
-run_emsdk('install tot-upstream')
-old_config = open(emconfig).read()
-run_emsdk('activate tot-upstream')
-assert old_config == open(emconfig + '.old').read()
-# TODO; test on latest as well
-check_call(upstream_emcc + ' hello_world.c')
-
-print('test specific release (old, using sdk-* notation)')
-run_emsdk('install sdk-fastcomp-1.38.31-64bit')
-run_emsdk('activate sdk-fastcomp-1.38.31-64bit')
-
-print('test specific release (new, short name)')
-run_emsdk('install 1.38.33')
-print('another install, but no need for re-download')
-checked_call_with_output(emsdk + ' install 1.38.33', expected='Skipped', unexpected='Downloading:')
-run_emsdk('activate 1.38.33')
-assert 'upstream' not in open(emconfig).read()
-assert 'fastcomp' in open(emconfig).read()
-
-print('test specific release (new, full name)')
-run_emsdk('install sdk-1.38.33-upstream-64bit')
-run_emsdk('activate sdk-1.38.33-upstream-64bit')
-
-print('test specific release (new, full name)')
-run_emsdk('install sdk-tag-1.38.33-64bit')
-run_emsdk('activate sdk-tag-1.38.33-64bit')
-
-print('test binaryen source build')
-run_emsdk(['install', '--build=Release', '--generator=Unix Makefiles', 'binaryen-master-64bit'])
-
-print('test 32-bit error')
-
-failing_call_with_output('python %s install latest' % hack_emsdk('not is_os_64bit()', 'True'), 'this tool is only provided for 64-bit OSes')
-
-print('test non-git update')
-
-temp_dir = tempfile.mkdtemp()
-
-for filename in os.listdir('.'):
-  if not filename.startswith('.') and not os.path.isdir(filename):
-    shutil.copy2(filename, os.path.join(temp_dir, filename))
+class Emsdk(unittest.TestCase):
+  @classmethod
+  def setUpClass(cls):
+    with open('hello_world.c', 'w') as f:
+      f.write('''\
+#include <stdio.h>
 
-os.chdir(temp_dir)
+int main() {
+   printf("Hello, world!\\n");
+   return 0;
+}
+''')
 
-run_emsdk('update')
-print('second time')
-run_emsdk('update')
+  def setUp(self):
+    checked_call_with_output(emsdk + ' install latest')
+    checked_call_with_output(emsdk + ' activate latest')
+
+  def test_already_installed(self):
+    # Test we don't re-download unnecessarily
+    checked_call_with_output(emsdk + ' install latest', expected='already installed', unexpected='Downloading:')
+
+  def test_list(self):
+    # Test we report installed tools properly. The latest version should be
+    # installed, but not some random old one.
+    checked_call_with_output(emsdk + ' list', expected=TAGS['latest'] + '    INSTALLED', unexpected='1.39.15    INSTALLED:')
+
+  def test_config_contents(self):
+    print('test .emscripten contents')
+    with open(emconfig) as f:
+      config = f.read()
+    assert 'fastcomp' not in config
+    assert 'upstream' in config
+
+  def test_lib_building(self):
+    print('building proper system libraries')
+    do_lib_building(upstream_emcc)
+
+  def test_fastcomp(self):
+    print('test the last fastcomp release')
+    run_emsdk('install 1.40.1-fastcomp')
+    run_emsdk('activate 1.40.1-fastcomp')
+
+    do_lib_building(fastcomp_emcc)
+    with open(emconfig) as f:
+      config = f.read()
+    assert config.count('LLVM_ROOT') == 1
+    assert 'upstream' not in config
+    assert 'fastcomp' in config
+
+    print('verify latest fastcomp version is fixed at 1.40.1')
+    checked_call_with_output(fastcomp_emcc + ' -v', '1.40.1', stderr=subprocess.STDOUT)
+
+  def test_fastcomp_missing(self):
+    print('verify that attempting to use newer fastcomp gives an error')
+    fastcomp_error = 'The fastcomp backend is not getting new builds or releases. Please use the upstream llvm backend or use an older version than 2.0.0 (such as 1.40.1).'
+    failing_call_with_output(emsdk + ' install latest-fastcomp', fastcomp_error)
+    failing_call_with_output(emsdk + ' install tot-fastcomp', fastcomp_error)
+    failing_call_with_output(emsdk + ' install 2.0.0-fastcomp', fastcomp_error)
+
+  def test_redownload(self):
+    print('go back to using upstream')
+    run_emsdk('activate latest')
+
+    # Test the normal tools like node don't re-download on re-install
+    print('another install must re-download')
+    checked_call_with_output(emsdk + ' uninstall node-14.15.5-64bit')
+    checked_call_with_output(emsdk + ' install node-14.15.5-64bit', expected='Downloading:', unexpected='already installed')
+    checked_call_with_output(emsdk + ' install node-14.15.5-64bit', unexpected='Downloading:', expected='already installed')
+
+  def test_tot_upstream(self):
+    print('test update-tags')
+    run_emsdk('update-tags')
+    print('test tot-upstream')
+    run_emsdk('install tot-upstream')
+    with open(emconfig) as f:
+      config = f.read()
+    run_emsdk('activate tot-upstream')
+    with open(emconfig + '.old') as f:
+      old_config = f.read()
+    self.assertEqual(config, old_config)
+    # TODO; test on latest as well
+    check_call(upstream_emcc + ' hello_world.c')
+
+  def test_specific_old(self):
+    print('test specific release (old, using sdk-* notation)')
+    run_emsdk('install sdk-fastcomp-1.38.31-64bit')
+    run_emsdk('activate sdk-fastcomp-1.38.31-64bit')
+
+  def test_specific_version(self):
+    print('test specific release (new, short name)')
+    run_emsdk('install 1.38.33')
+    print('another install, but no need for re-download')
+    checked_call_with_output(emsdk + ' install 1.38.33', expected='Skipped', unexpected='Downloading:')
+    run_emsdk('activate 1.38.33')
+    with open(emconfig) as f:
+      config = f.read()
+    assert 'upstream' not in config
+    assert 'fastcomp' in config
+
+  def test_specific_version_full(self):
+    print('test specific release (new, full name)')
+    run_emsdk('install sdk-1.38.33-upstream-64bit')
+    run_emsdk('activate sdk-1.38.33-upstream-64bit')
+    print('test specific release (new, tag name)')
+    run_emsdk('install sdk-tag-1.38.33-64bit')
+    run_emsdk('activate sdk-tag-1.38.33-64bit')
+
+  def test_binaryen_from_source(self):
+    print('test binaryen source build')
+    run_emsdk(['install', '--build=Release', '--generator=Unix Makefiles', 'binaryen-master-64bit'])
+
+  def test_no_32bit(self):
+    print('test 32-bit error')
+    emsdk_hacked = hack_emsdk('not is_os_64bit()', 'True')
+    failing_call_with_output('python %s install latest' % emsdk_hacked, 'this tool is only provided for 64-bit OSes')
+    os.remove(emsdk_hacked)
+
+  def test_update_no_git(self):
+    print('test non-git update')
+
+    temp_dir = tempfile.mkdtemp()
+    for filename in os.listdir('.'):
+      if not filename.startswith('.') and not os.path.isdir(filename):
+        shutil.copy2(filename, os.path.join(temp_dir, filename))
+
+    os.chdir(temp_dir)
+    run_emsdk('update')
+
+    print('second time')
+    run_emsdk('update')
+
+
+if __name__ == '__main__':
+  unittest.main(verbosity=2)

From 53eacf405d616b9b17125a2ebdf6308e1cf48e3f Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 1 Mar 2021 17:32:03 -0800
Subject: [PATCH 120/161] Allow the install of any emscripten-releases build
 (#732)

This is done by detecting the 40 character git sha in the SDK version
and creating a new set of tools based on this SHA.  This works for any
command that uses expand_sdk_name (i.e. install activate and update) but
it wont show up in the output of `list`.

For example:

./emsdk install sdk-releases-upstream-b0cfdb236483b6828ee2e3f263fd94f011ed1863-64bit

Or just:

./emsdk install releases-upstream-b0cfdb236483b6828ee2e3f263fd94f011ed1863
---
 emsdk.py        | 20 ++++++++++++++++----
 scripts/test.py | 11 +++++++++--
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index f1f8c127af..4d44cb4503 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -49,6 +49,8 @@
 
 zips_subdir = 'zips/'
 
+extra_release_tag = None
+
 # Enable this to do very verbose printing about the different steps that are
 # being run. Useful for debugging.
 VERBOSE = int(os.getenv('EMSDK_VERBOSE', '0'))
@@ -2202,12 +2204,16 @@ def load_releases_tags():
   tags = []
   tags_fastcomp = []
   info = load_releases_info()
+
   for version, sha in sorted(info['releases'].items(), key=lambda x: version_key(x[0])):
     tags.append(sha)
     # Only include versions older than 1.39.0 in fastcomp releases
     if version_key(version) < (2, 0, 0):
       tags_fastcomp.append(sha)
 
+  if extra_release_tag:
+    tags.append(extra_release_tag)
+
   # Add the tip-of-tree, if it exists.
   if os.path.exists(tot_path()):
     tot = find_tot()
@@ -2248,6 +2254,7 @@ def dependencies_exist(sdk):
     for tool_name in sdk.uses:
       tool = find_tool(tool_name)
       if not tool:
+        debug_print('missing dependency: ' + tool_name)
         return False
     return True
 
@@ -2641,6 +2648,7 @@ def expand_sdk_name(name):
     releases_info = load_releases_info()['releases']
     release_hash = get_release_hash(version, releases_info)
     if release_hash:
+      # Known release hash
       if backend == 'fastcomp' and version_key(version) >= (2, 0, 0):
         exit_with_fastcomp_error()
       if backend is None:
@@ -2649,6 +2657,10 @@ def expand_sdk_name(name):
         else:
           backend = 'fastcomp'
       return 'sdk-releases-%s-%s-64bit' % (backend, release_hash)
+    elif len(version) == 40:
+      global extra_release_tag
+      extra_release_tag = version
+      return 'sdk-releases-%s-%s-64bit' % (backend, version)
   return name
 
 
@@ -2803,6 +2815,10 @@ def extract_bool_arg(name):
     global TTY_OUTPUT
     TTY_OUTPUT = False
 
+  # Replace meta-packages with the real package names.
+  if cmd in ('update', 'install', 'activate'):
+    args = [expand_sdk_name(a) for a in args]
+
   load_dot_emscripten()
   load_sdk_manifest()
 
@@ -2835,10 +2851,6 @@ def extract_bool_arg(name):
         return 1
   args = [x for x in args if x]
 
-  # Replace meta-packages with the real package names.
-  if cmd in ('update', 'install', 'activate'):
-    args = [expand_sdk_name(a) for a in args]
-
   if cmd == 'list':
     print('')
 
diff --git a/scripts/test.py b/scripts/test.py
index f9248797df..e8dd7f40ec 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -136,8 +136,8 @@ def setUpClass(cls):
 ''')
 
   def setUp(self):
-    checked_call_with_output(emsdk + ' install latest')
-    checked_call_with_output(emsdk + ' activate latest')
+    run_emsdk('install latest')
+    run_emsdk('activate latest')
 
   def test_already_installed(self):
     # Test we don't re-download unnecessarily
@@ -253,6 +253,13 @@ def test_update_no_git(self):
     print('second time')
     run_emsdk('update')
 
+  def test_install_arbitrary(self):
+    # Test that its possible to install arbrary emscripten-releases SDKs
+    run_emsdk('install sdk-releases-upstream-5c776e6a91c0cb8edafca16a652ee1ee48f4f6d2')
+
+    # Check that its not re-downloaded
+    checked_call_with_output(emsdk + ' install sdk-releases-upstream-5c776e6a91c0cb8edafca16a652ee1ee48f4f6d2', expected='Skipped', unexpected='Downloading:')
+
 
 if __name__ == '__main__':
   unittest.main(verbosity=2)

From 9d00a82b6a8161765a0243e05305c905433c7c6f Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 5 Mar 2021 09:19:42 -0800
Subject: [PATCH 121/161] Remove `update-tags` phase (#738)

Its not really very useful to cache the tot release in a local text
file.  Instead just fetch the revsion each time `install tot` is run.

This avoids folks accidentally installing "old" tot releases.

Also, make the output a little less chatty when looking up tot version.
---
 README.md         |  3 +-
 docker/Dockerfile |  1 -
 emsdk.py          | 72 +++++++++--------------------------------------
 3 files changed, 15 insertions(+), 61 deletions(-)

diff --git a/README.md b/README.md
index 829b93f99f..8b5f5fdece 100644
--- a/README.md
+++ b/README.md
@@ -117,8 +117,7 @@ SDK from the local hard drive completely.
 
 `emsdk update` will fetch package information for all the new tools and
 SDK versions. After that, run `emsdk install <tool/sdk name>` to install a new
-version. The command `emsdk update-tags` obtains a list of all new tagged
-releases from GitHub without updating Emscripten SDK itself.
+version.
 
 ### How do I install an old Emscripten compiler version?
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d31e0dfd22..e5674ea42d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -23,7 +23,6 @@ COPY . ${EMSDK}
 
 RUN echo "## Install Emscripten" \
     && cd ${EMSDK} \
-    && if [ "$EMSCRIPTEN_VERSION" = "tot" ]; then ./emsdk update-tags; fi \
     && ./emsdk install ${EMSCRIPTEN_VERSION} \
     && echo "## Done"
 
diff --git a/emsdk.py b/emsdk.py
index 4d44cb4503..b83618c0f8 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -787,7 +787,7 @@ def git_recent_commits(repo_path, n=20):
 def git_clone(url, dstpath):
   debug_print('git_clone(url=' + url + ', dstpath=' + dstpath + ')')
   if os.path.isdir(os.path.join(dstpath, '.git')):
-    print("Repository '" + url + "' already cloned to directory '" + dstpath + "', skipping.")
+    debug_print("Repository '" + url + "' already cloned to directory '" + dstpath + "', skipping.")
     return True
   mkdir_p(dstpath)
   git_clone_args = []
@@ -798,12 +798,12 @@ def git_clone(url, dstpath):
 
 def git_checkout_and_pull(repo_path, branch):
   debug_print('git_checkout_and_pull(repo_path=' + repo_path + ', branch=' + branch + ')')
-  ret = run([GIT(), 'fetch', 'origin'], repo_path)
+  ret = run([GIT(), 'fetch', '--quiet', 'origin'], repo_path)
   if ret != 0:
     return False
   try:
     print("Fetching latest changes to the branch '" + branch + "' for '" + repo_path + "'...")
-    ret = run([GIT(), 'fetch', 'origin'], repo_path)
+    ret = run([GIT(), 'fetch', '--quiet', 'origin'], repo_path)
     if ret != 0:
       return False
     #  run([GIT, 'checkout', '-b', branch, '--track', 'origin/'+branch], repo_path)
@@ -2047,19 +2047,11 @@ def find_latest_releases_sdk(which):
   return 'sdk-releases-%s-%s-64bit' % (which, find_latest_releases_hash())
 
 
-def find_tot():
-  return open(tot_path()).read().strip()
-
-
-def find_tot_sdk(which):
-  if not os.path.exists(tot_path()):
-    print('Tip-of-tree information was not found, run emsdk update-tags')
-    sys.exit(1)
-  tot = find_tot()
-  if not tot:
-    print('Tip-of-tree build was not found, run emsdk update-tags (however, if there is no recent tip-of-tree build, you may need to wait)')
-    sys.exit(1)
-  return 'sdk-releases-%s-%s-64bit' % (which, tot)
+def find_tot_sdk():
+  debug_print('Fetching emscripten-releases repository...')
+  global extra_release_tag
+  extra_release_tag = get_emscripten_releases_tot()
+  return 'sdk-releases-upstream-%s-64bit' % (extra_release_tag)
 
 
 # Given a git hash in emscripten-releases, find the emscripten
@@ -2073,10 +2065,6 @@ def get_emscripten_release_version(emscripten_releases_hash):
   return None
 
 
-def tot_path():
-  return sdk_path('emscripten-releases-tot.txt')
-
-
 # Get the tip-of-tree build identifier.
 def get_emscripten_releases_tot():
   git_clone_checkout_and_pull(emscripten_releases_repo, sdk_path('releases'), 'master')
@@ -2115,12 +2103,6 @@ def python_2_3_sorted(arr, cmp):
     return sorted(arr, cmp=cmp)
 
 
-def update_tags():
-  print('Fetching emscripten-releases repository...')
-  emscripten_releases_tot = get_emscripten_releases_tot()
-  open(tot_path(), 'w').write(emscripten_releases_tot)
-
-
 def is_emsdk_sourced_from_github():
   return os.path.exists(os.path.join(emsdk_path(), '.git'))
 
@@ -2128,22 +2110,9 @@ def is_emsdk_sourced_from_github():
 def update_emsdk():
   if is_emsdk_sourced_from_github():
     errlog('You seem to have bootstrapped Emscripten SDK by cloning from GitHub. In this case, use "git pull" instead of "emsdk update" to update emsdk. (Not doing that automatically in case you have local changes)')
-    errlog('Alternatively, use "emsdk update-tags" to refresh the latest list of tags from the different Git repositories.')
     sys.exit(1)
   if not download_and_unzip(emsdk_zip_download_url, emsdk_path(), download_even_if_exists=True, clobber=False):
     sys.exit(1)
-  if not GIT(must_succeed=False):
-    print('Update complete, however skipped update-tags, since git was not found.')
-    if WINDOWS:
-      print("Please install git by typing 'emsdk install git-1.9.4', or alternatively by installing it manually from http://git-scm.com/downloads . If you install git manually, remember to add it to PATH.")
-    elif MACOS:
-      print("Please install git from http://git-scm.com/ , or by installing XCode and then the XCode Command Line Tools (see http://stackoverflow.com/questions/9329243/xcode-4-4-command-line-tools ).")
-    elif LINUX:
-      print("Pease install git using your package manager, see http://git-scm.com/book/en/Getting-Started-Installing-Git .")
-    else:
-      print("Please install git.")
-    return
-  update_tags()
 
 
 # Lists all legacy (pre-emscripten-releases) tagged versions directly in the Git
@@ -2214,12 +2183,6 @@ def load_releases_tags():
   if extra_release_tag:
     tags.append(extra_release_tag)
 
-  # Add the tip-of-tree, if it exists.
-  if os.path.exists(tot_path()):
-    tot = find_tot()
-    if tot:
-      tags.append(tot)
-
   return tags, tags_fastcomp
 
 
@@ -2626,10 +2589,8 @@ def expand_sdk_name(name):
     return str(find_latest_releases_sdk('upstream'))
   elif name in ('latest-upstream', 'latest-clang-upstream', 'latest-releases-upstream'):
     return str(find_latest_releases_sdk('upstream'))
-  elif name in ('tot', 'sdk-tot'):
-    return str(find_tot_sdk('upstream'))
-  elif name == 'tot-upstream':
-    return str(find_tot_sdk('upstream'))
+  elif name in ('tot', 'sdk-tot', 'tot-upstream'):
+    return str(find_tot_sdk())
   else:
     # check if it's a release handled by an emscripten-releases version,
     # and if so use that by using the right hash. we support a few notations,
@@ -2682,15 +2643,10 @@ def main(args):
                                   composition of different SDK packages and
                                   dependencies.
 
-   emsdk update                 - Updates emsdk to the newest version, and also
-                                  runs 'update-tags' (below). If you have
+   emsdk update                 - Updates emsdk to the newest version. If you have
                                   bootstrapped emsdk via cloning directly from
                                   GitHub, call "git pull" instead to update emsdk.
 
-   emsdk update-tags            - Fetches the most up to date list of available
-                                  Emscripten tagged and other releases from the
-                                  servers.
-
    emsdk install [options] <tool 1> <tool 2> <tool 3> ...
                                 - Downloads and installs given tools or SDKs.
                                   Options can contain:
@@ -2951,7 +2907,7 @@ def print_tools(t):
       print_tools(find_tools(needs_compilation=True))
     else:
       if is_emsdk_sourced_from_github():
-        print("There are no tools available. Run 'git pull' followed by 'emsdk update-tags' to fetch the latest set of tools.")
+        print("There are no tools available. Run 'git pull' to fetch the latest set of tools.")
       else:
         print("There are no tools available. Run 'emsdk update' to fetch the latest set of tools.")
       print('')
@@ -2966,7 +2922,7 @@ def print_tools(t):
 
     print('')
     if is_emsdk_sourced_from_github():
-      print('Run "git pull" followed by "./emsdk update-tags" to pull in the latest list.')
+      print('Run "git pull" to pull in the latest list.')
     else:
       print('Run "./emsdk update" to pull in the latest list.')
 
@@ -2990,7 +2946,7 @@ def print_tools(t):
       rmfile(sdk_path(EMSDK_SET_ENV))
     return 0
   elif cmd == 'update-tags':
-    update_tags()
+    errlog('`update-tags` is not longer needed.  To install the latest tot release just run `install tot`')
     return 0
   elif cmd == 'activate':
     if arg_permanent:

From 8915c20b06ec7424502a6fab172eac1cf93710cb Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 5 Mar 2021 09:44:19 -0800
Subject: [PATCH 122/161] Always print debug info to stderr (#739)

---
 emsdk.py | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index b83618c0f8..69135da1c5 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -164,9 +164,9 @@ def os_name_for_emscripten_releases():
     raise Exception('unknown OS')
 
 
-def debug_print(msg, **args):
+def debug_print(msg):
   if VERBOSE:
-    print(msg, **args)
+    errlog(msg)
 
 
 def to_unix_path(p):
@@ -361,7 +361,7 @@ def win_get_environment_variable(key, system=True, user=True, fallback=True):
 
 
 def win_set_environment_variable(key, value, system, user):
-  debug_print('set ' + str(key) + '=' + str(value) + ', in system=' + str(system), file=sys.stderr)
+  debug_print('set ' + str(key) + '=' + str(value) + ', in system=' + str(system))
   previous_value = win_get_environment_variable(key, system=system, user=user)
   if previous_value == value:
     debug_print('  no need to set, since same value already exists.')
@@ -504,7 +504,7 @@ def run(cmd, cwd=None):
   process = subprocess.Popen(cmd, cwd=cwd, env=os.environ.copy())
   process.communicate()
   if process.returncode != 0:
-    print(str(cmd) + ' failed with error code ' + str(process.returncode) + '!')
+    errlog(str(cmd) + ' failed with error code ' + str(process.returncode) + '!')
   return process.returncode
 
 
@@ -613,11 +613,11 @@ def unzip(source_filename, dest_dir, unpack_even_if_exists=False):
       if common_subdir:
         remove_tree(unzip_to_dir)
   except zipfile.BadZipfile as e:
-    print("Unzipping file '" + source_filename + "' failed due to reason: " + str(e) + "! Removing the corrupted zip file.")
+    errlog("Unzipping file '" + source_filename + "' failed due to reason: " + str(e) + "! Removing the corrupted zip file.")
     rmfile(source_filename)
     return False
   except Exception as e:
-    print("Unzipping file '" + source_filename + "' failed due to reason: " + str(e))
+    errlog("Unzipping file '" + source_filename + "' failed due to reason: " + str(e))
     return False
 
   return True
@@ -817,7 +817,7 @@ def git_checkout_and_pull(repo_path, branch):
     if ret != 0:
       return False
   except:
-    print('git operation failed!')
+    errlog('git operation failed!')
     return False
   print("Successfully updated and checked out branch '" + branch + "' on repository '" + repo_path + "'")
   print("Current repository version: " + git_repo_version(repo_path))
@@ -1243,9 +1243,9 @@ def emscripten_npm_install(tool, directory):
   if not node_tool:
     npm_fallback = which('npm')
     if not npm_fallback:
-      print('Failed to find npm command!')
-      print('Running "npm ci" in installed Emscripten root directory ' + tool.installation_path() + ' is required!')
-      print('Please install node.js first!')
+      errlog('Failed to find npm command!')
+      errlog('Running "npm ci" in installed Emscripten root directory ' + tool.installation_path() + ' is required!')
+      errlog('Please install node.js first!')
       return False
     node_path = os.path.dirname(npm_fallback)
   else:
@@ -1261,7 +1261,7 @@ def emscripten_npm_install(tool, directory):
         cwd=directory, stderr=subprocess.STDOUT, env=env,
         universal_newlines=True)
   except subprocess.CalledProcessError as e:
-    print('Error running %s:\n%s' % (e.cmd, e.output))
+    errlog('Error running %s:\n%s' % (e.cmd, e.output))
     return False
 
   # Manually install the appropriate native Closure Compiler package
@@ -1289,7 +1289,7 @@ def emscripten_npm_install(tool, directory):
         cwd=directory, stderr=subprocess.STDOUT, env=env,
         universal_newlines=True)
     except subprocess.CalledProcessError as e:
-      print('Error running %s:\n%s' % (e.cmd, e.output))
+      errlog('Error running %s:\n%s' % (e.cmd, e.output))
       return False
 
   print('Done running: npm ci')
@@ -1473,7 +1473,6 @@ def load_dot_emscripten():
       key, value = parse_key_value(line)
       if value != '':
         dot_emscripten[key] = value
-      # print("Got '" + key + "' = '" + value + "'")
     except:
       pass
 
@@ -1711,7 +1710,7 @@ def is_installed(self, skip_version_check=False):
       for tool_name in self.uses:
         tool = find_tool(tool_name)
         if tool is None:
-          print("Manifest error: No tool by name '" + tool_name + "' found! This may indicate an internal SDK error!")
+          errlog("Manifest error: No tool by name '" + tool_name + "' found! This may indicate an internal SDK error!")
           return False
         if not tool.is_installed():
           return False

From 9d639b383a7c63b91c5f60a788bfadf291e8b94d Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 5 Mar 2021 12:51:04 -0800
Subject: [PATCH 123/161] Fix for `construct_env` and `list` with tot build
 installed (#741)

---
 emsdk.py        | 11 +++++++++++
 scripts/test.sh |  9 +++++++++
 2 files changed, 20 insertions(+)

diff --git a/emsdk.py b/emsdk.py
index 69135da1c5..c6d1f55671 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2182,6 +2182,17 @@ def load_releases_tags():
   if extra_release_tag:
     tags.append(extra_release_tag)
 
+  # Adds the currently installed SDK version, which might be a custom
+  # version.  This means it will show up in `list` and work with
+  # `construct_env`
+  version_file = sdk_path(os.path.join('upstream', '.emsdk_version'))
+  if os.path.exists(version_file):
+    with open(version_file) as f:
+      version = f.read()
+    version = version.split('-')[2]
+    if version not in tags:
+      tags.append(version)
+
   return tags, tags_fastcomp
 
 
diff --git a/scripts/test.sh b/scripts/test.sh
index 73c0d42efb..473dbb1ff1 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -5,10 +5,19 @@ echo "test the standard workflow (as close as possible to how a user would do it
 set -x
 set -e
 
+# Test that arbitrary (non-released) versions can be installed and
+# activated.
+./emsdk install sdk-upstream-5c776e6a91c0cb8edafca16a652ee1ee48f4f6d2
+./emsdk activate sdk-upstream-5c776e6a91c0cb8edafca16a652ee1ee48f4f6d2
+source ./emsdk_env.sh
+which emcc
+emcc -v
+
 ./emsdk install latest
 ./emsdk activate latest
 source ./emsdk_env.sh --build=Release
 # On mac and windows python3 should be in the path and point to the
 # bundled version.
 which python3
+which emcc
 emcc -v

From 6e2873c834b540fd54981ebf72981e90c4b6b0b2 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 5 Mar 2021 13:32:33 -0800
Subject: [PATCH 124/161] Feedback from #741.  NFC. (#742)

---
 emsdk.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index c6d1f55671..1e60924393 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2182,9 +2182,8 @@ def load_releases_tags():
   if extra_release_tag:
     tags.append(extra_release_tag)
 
-  # Adds the currently installed SDK version, which might be a custom
-  # version.  This means it will show up in `list` and work with
-  # `construct_env`
+  # Explicitly add the currently installed SDK version.  This could be a custom
+  # version (installed explicitly) so it might not be part of the main list loaded above.
   version_file = sdk_path(os.path.join('upstream', '.emsdk_version'))
   if os.path.exists(version_file):
     with open(version_file) as f:

From 7cba2e0a92b9df42376707dfdae6e1f108f79a27 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 5 Mar 2021 23:18:22 -0800
Subject: [PATCH 125/161] 2.0.15 (#743)

---
 bazel/WORKSPACE              | 6 +++---
 emscripten-releases-tags.txt | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index 1b65941983..d2e8629291 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -8,12 +8,12 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
 
-# emscripten 2.0.14
+# emscripten 2.0.15
 http_archive(
     name = "emscripten",
-    sha256 = "e466cd47ddd4bf0acd645412fdf08eda6d232484e48e5a2643e08062a7a4cf56",
+    sha256 = "7ff49fc63adf29970f6e7af1df445d7f554bdbbb2606db1cb5d3567ce69df1db",
     strip_prefix = "install",
-    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/fc5562126762ab26c4757147a3b4c24e85a7289e/wasm-binaries.tbz2",
+    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/89202930a98fe7f9ed59b574469a9471b0bda7dd/wasm-binaries.tbz2",
     build_file = "//emscripten_toolchain:emscripten.BUILD",
     type = "tar.bz2",
 )
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 051ea7b469..8b327ea71e 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.14",
+  "latest": "2.0.15",
   "releases": {
+    "2.0.15":  "89202930a98fe7f9ed59b574469a9471b0bda7dd",
     "2.0.14":  "fc5562126762ab26c4757147a3b4c24e85a7289e",
     "2.0.13":  "ce0e4a4d1cab395ee5082a60ebb4f3891a94b256",
     "2.0.12":  "dcf819a7821f8db0c8f15ac336fea8960ec204f5",

From f0ee795014f05f68f28f0199963af1e4763ecc28 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 8 Mar 2021 08:02:38 -0800
Subject: [PATCH 126/161] Remove special version check for vs-tool. NFC. (#740)

As of #505 all tools write a check a version file so we don't need to
special case vs-tool anymore.
---
 emsdk.py | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 1e60924393..1148412296 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -1551,13 +1551,6 @@ def find_msbuild_dir():
   return ''
 
 
-def get_installed_vstool_version(installed_path):
-  try:
-    return open(installed_path + "/version.txt", "r").read()
-  except:
-    return None
-
-
 class Tool(object):
   def __init__(self, data):
     # Convert the dictionary representation of the tool in 'data' to members of
@@ -1695,12 +1688,12 @@ def is_installed_version(self):
     version_file_path = self.get_version_file_path()
     if os.path.isfile(version_file_path):
       with open(version_file_path, 'r') as version_file:
-        return version_file.read() == self.name
+        return version_file.read().strip() == self.name
     return False
 
   def update_installed_version(self):
     with open(self.get_version_file_path(), 'w') as version_file:
-      version_file.write(self.name)
+      version_file.write(self.name + '\n')
     return None
 
   def is_installed(self, skip_version_check=False):
@@ -1731,11 +1724,6 @@ def is_installed(self, skip_version_check=False):
     if hasattr(self, 'activated_path') and not os.path.exists(self.expand_vars(self.activated_path)):
       content_exists = False
 
-    # vs-tool is a special tool since all versions must be installed to the
-    # same dir, so dir name will not differentiate the version.
-    if self.id == 'vs-tool':
-      return content_exists and get_installed_vstool_version(self.installation_path()) == self.version
-
     if hasattr(self, 'custom_is_installed_script'):
       if self.custom_is_installed_script == 'is_optimizer_installed':
         return is_optimizer_installed(self)

From 7d155f842431af4d9c2e3a55149a881283a06920 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 8 Mar 2021 08:03:07 -0800
Subject: [PATCH 127/161] Move tests to "test" directory.  NFC. (#745)

---
 .circleci/config.yml                         | 28 ++++++++++----------
 {scripts => test}/test.bat                   |  0
 {scripts => test}/test.py                    |  0
 {scripts => test}/test.sh                    |  0
 {scripts => test}/test_activation.ps1        |  0
 {scripts => test}/test_bazel.sh              |  0
 {scripts => test}/test_path_preservation.ps1 |  0
 {scripts => test}/test_source_env.sh         |  0
 8 files changed, 14 insertions(+), 14 deletions(-)
 rename {scripts => test}/test.bat (100%)
 rename {scripts => test}/test.py (100%)
 rename {scripts => test}/test.sh (100%)
 rename {scripts => test}/test_activation.ps1 (100%)
 rename {scripts => test}/test_bazel.sh (100%)
 rename {scripts => test}/test_path_preservation.ps1 (100%)
 rename {scripts => test}/test_source_env.sh (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d5ff7d6309..20288af0d6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,13 +35,13 @@ jobs:
       - run:
           name: Install debian packages
           command: apt-get update -q && apt-get install -q -y cmake build-essential openjdk-8-jre-headless ksh zsh
-      - run: scripts/test.sh
-      - run: scripts/test_source_env.sh
+      - run: test/test.sh
+      - run: test/test_source_env.sh
       - run:
           name: test.py
           command: |
             source emsdk_env.sh
-            scripts/test.py
+            test/test.py
   test-mac:
     macos:
       xcode: "12.2.0"
@@ -55,12 +55,12 @@ jobs:
       - run:
           name: Install cmake
           command: brew install cmake
-      - run: scripts/test.sh
+      - run: test/test.sh
       - run:
           name: test.py
           command: |
             source emsdk_env.sh
-            scripts/test.py
+            test/test.py
   test-windows:
     executor:
       name: win/vs2019
@@ -81,52 +81,52 @@ jobs:
       - run:
           name: Install latest
           shell: cmd.exe
-          command: scripts\test.bat
+          command: test\test.bat
       - run:
           name: test.py
           command: |
             source emsdk_env.sh
-            python scripts/test.py
+            python test/test.py
 
       - run:
           name: flagless (process/shell) test
           shell: powershell.exe
           command: |
-            scripts/test_activation.ps1
+            test/test_activation.ps1
 
       - run:
           name: --permanent test
           shell: powershell.exe
           command: |
             $env:PERMANENT_FLAG="--permanent"
-            scripts/test_activation.ps1
+            test/test_activation.ps1
 
       - run:
           name: --system test
           shell: powershell.exe
           command: |
             $env:SYSTEM_FLAG="--system"
-            scripts/test_activation.ps1
+            test/test_activation.ps1
 
       - run:
           name: Process/Shell PATH preservation test
           shell: powershell.exe
           command: |
-            scripts/test_path_preservation.ps1
+            test/test_path_preservation.ps1
 
       - run:
           name: User PATH preservation test
           shell: powershell.exe
           command: |
             $env:PERMANENT_FLAG="--permanent"
-            scripts/test_path_preservation.ps1
+            test/test_path_preservation.ps1
 
       - run:
           name: System PATH preservation test
           shell: powershell.exe
           command: |
             $env:SYSTEM_FLAG="--system"
-            scripts/test_path_preservation.ps1
+            test/test_path_preservation.ps1
 
   build-docker-image:
     executor: bionic
@@ -184,7 +184,7 @@ jobs:
           name: install bazel
           command: |
             apt-get install -q -y bazel
-      - run: scripts/test_bazel.sh
+      - run: test/test_bazel.sh
 
 workflows:
   flake8:
diff --git a/scripts/test.bat b/test/test.bat
similarity index 100%
rename from scripts/test.bat
rename to test/test.bat
diff --git a/scripts/test.py b/test/test.py
similarity index 100%
rename from scripts/test.py
rename to test/test.py
diff --git a/scripts/test.sh b/test/test.sh
similarity index 100%
rename from scripts/test.sh
rename to test/test.sh
diff --git a/scripts/test_activation.ps1 b/test/test_activation.ps1
similarity index 100%
rename from scripts/test_activation.ps1
rename to test/test_activation.ps1
diff --git a/scripts/test_bazel.sh b/test/test_bazel.sh
similarity index 100%
rename from scripts/test_bazel.sh
rename to test/test_bazel.sh
diff --git a/scripts/test_path_preservation.ps1 b/test/test_path_preservation.ps1
similarity index 100%
rename from scripts/test_path_preservation.ps1
rename to test/test_path_preservation.ps1
diff --git a/scripts/test_source_env.sh b/test/test_source_env.sh
similarity index 100%
rename from scripts/test_source_env.sh
rename to test/test_source_env.sh

From 226b548c315916e615d795bacdfc0abd1d1db9dc Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 8 Mar 2021 08:33:25 -0800
Subject: [PATCH 128/161] Rename binaryen-master to binaryen-main (#746)

This matches the branch name that was already updated/renamed.
---
 emsdk_manifest.json | 20 ++++++++++----------
 test/test.py        |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 0457c865ce..9c7dc5a6f8 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -422,7 +422,7 @@
   },
   {
     "id": "binaryen",
-    "version": "master",
+    "version": "main",
     "bitness": 64,
     "append_bitness": false,
     "url": "https://github.com/WebAssembly/binaryen.git",
@@ -464,55 +464,55 @@
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "emscripten-master-64bit", "binaryen-main-64bit"],
     "os": "win"
   },
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-main-64bit"],
     "os": "macos"
   },
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-master-64bit", "binaryen-main-64bit"],
     "os": "linux"
   },
   {
     "version": "upstream-master",
     "bitness": 32,
-    "uses": ["llvm-git-main-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
+    "uses": ["llvm-git-main-32bit", "emscripten-master-32bit", "binaryen-main-32bit"],
     "os": "linux"
   },
   {
     "version": "fastcomp-master",
     "bitness": 32,
-    "uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "python-3.7.4-32bit", "java-8.152-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
+    "uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "python-3.7.4-32bit", "java-8.152-32bit", "emscripten-master-32bit", "binaryen-main-32bit"],
     "os": "win"
   },
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "emscripten-master-64bit", "binaryen-main-64bit"],
     "os": "win"
   },
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-main-64bit"],
     "os": "macos"
   },
   {
     "version": "fastcomp-master",
     "bitness": 32,
-    "uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "emscripten-master-32bit", "binaryen-master-32bit"],
+    "uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "emscripten-master-32bit", "binaryen-main-32bit"],
     "os": "linux"
   },
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "emscripten-master-64bit", "binaryen-master-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "emscripten-master-64bit", "binaryen-main-64bit"],
     "os": "linux"
   },
   {
diff --git a/test/test.py b/test/test.py
index e8dd7f40ec..c78858dc68 100755
--- a/test/test.py
+++ b/test/test.py
@@ -231,7 +231,7 @@ def test_specific_version_full(self):
 
   def test_binaryen_from_source(self):
     print('test binaryen source build')
-    run_emsdk(['install', '--build=Release', '--generator=Unix Makefiles', 'binaryen-master-64bit'])
+    run_emsdk(['install', '--build=Release', '--generator=Unix Makefiles', 'binaryen-main-64bit'])
 
   def test_no_32bit(self):
     print('test 32-bit error')

From 73183b5c30560c389f76466f22e2b45825e2e45b Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 8 Mar 2021 14:26:03 -0800
Subject: [PATCH 129/161] Fix race between `install tot` and `active tot`
 (#749)

Since #732 we lookup tot release dynamically, but we don't
necessarily want to do this for the `activate` command otherwise
`install` followed by `activate` a can fail if a new build was
produced inbetween.
---
 emsdk.py | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 1148412296..e457be89ae 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2155,6 +2155,15 @@ def load_releases_info():
   return load_releases_info.cached_info
 
 
+def get_installed_sdk_version():
+  version_file = sdk_path(os.path.join('upstream', '.emsdk_version'))
+  if not os.path.exists(version_file):
+    return None
+  with open(version_file) as f:
+    version = f.read()
+  return version.split('-')[2]
+
+
 # Get a list of tags for emscripten-releases.
 def load_releases_tags():
   tags = []
@@ -2172,13 +2181,9 @@ def load_releases_tags():
 
   # Explicitly add the currently installed SDK version.  This could be a custom
   # version (installed explicitly) so it might not be part of the main list loaded above.
-  version_file = sdk_path(os.path.join('upstream', '.emsdk_version'))
-  if os.path.exists(version_file):
-    with open(version_file) as f:
-      version = f.read()
-    version = version.split('-')[2]
-    if version not in tags:
-      tags.append(version)
+  installed = get_installed_sdk_version()
+  if installed and installed not in tags:
+    tags.append(installed)
 
   return tags, tags_fastcomp
 
@@ -2578,7 +2583,7 @@ def exit_with_fastcomp_error():
     exit_with_error('The fastcomp backend is not getting new builds or releases. Please use the upstream llvm backend or use an older version than 2.0.0 (such as 1.40.1).')
 
 
-def expand_sdk_name(name):
+def expand_sdk_name(name, activating):
   if name in ('latest-fastcomp', 'latest-releases-fastcomp', 'tot-fastcomp', 'sdk-nightly-latest'):
     exit_with_fastcomp_error()
   if name in ('latest', 'sdk-latest', 'latest-64bit', 'sdk-latest-64bit'):
@@ -2587,6 +2592,15 @@ def expand_sdk_name(name):
   elif name in ('latest-upstream', 'latest-clang-upstream', 'latest-releases-upstream'):
     return str(find_latest_releases_sdk('upstream'))
   elif name in ('tot', 'sdk-tot', 'tot-upstream'):
+    if activating:
+      # When we are activating a tot release, assume that the currently
+      # installed SDK, if any, is the tot release we want to activate.
+      # Without this `install tot && activate tot` will race with the builders
+      # that are producing new builds.
+      installed = get_installed_sdk_version()
+      if installed:
+        debug_print('activating currently installed SDK; not updating tot version')
+        return 'sdk-releases-upstream-%s-64bit' % installed
     return str(find_tot_sdk())
   else:
     # check if it's a release handled by an emscripten-releases version,
@@ -2770,7 +2784,8 @@ def extract_bool_arg(name):
 
   # Replace meta-packages with the real package names.
   if cmd in ('update', 'install', 'activate'):
-    args = [expand_sdk_name(a) for a in args]
+    activating = cmd == 'activate'
+    args = [expand_sdk_name(a, activating=activating) for a in args]
 
   load_dot_emscripten()
   load_sdk_manifest()

From 67dc4b49894dfaa9f4a60e6991186587c980ebc3 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 8 Mar 2021 15:52:14 -0800
Subject: [PATCH 130/161] Switch emscripten branch from master to main (#750)

---
 emsdk_manifest.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 9c7dc5a6f8..9915b5b84f 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -381,11 +381,11 @@
   },
   {
     "id": "emscripten",
-    "version": "master",
+    "version": "main",
     "bitness": 32,
     "append_bitness": false,
     "url": "https://github.com/emscripten-core/emscripten.git",
-    "git_branch": "master",
+    "git_branch": "main",
     "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%'",
     "activated_path": "%installation_dir%",
     "activated_env": "EMSCRIPTEN=%installation_dir%",
@@ -394,11 +394,11 @@
   },
   {
     "id": "emscripten",
-    "version": "master",
+    "version": "main",
     "bitness": 64,
     "append_bitness": false,
     "url": "https://github.com/emscripten-core/emscripten.git",
-    "git_branch": "master",
+    "git_branch": "main",
     "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%'",
     "activated_path": "%installation_dir%",
     "activated_env": "EMSCRIPTEN=%installation_dir%",
@@ -464,55 +464,55 @@
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "emscripten-master-64bit", "binaryen-main-64bit"],
+    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
     "os": "win"
   },
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-main-64bit"],
+    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
     "os": "macos"
   },
   {
     "version": "upstream-master",
     "bitness": 64,
-    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-master-64bit", "binaryen-main-64bit"],
+    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
     "os": "linux"
   },
   {
     "version": "upstream-master",
     "bitness": 32,
-    "uses": ["llvm-git-main-32bit", "emscripten-master-32bit", "binaryen-main-32bit"],
+    "uses": ["llvm-git-main-32bit", "emscripten-main-32bit", "binaryen-main-32bit"],
     "os": "linux"
   },
   {
     "version": "fastcomp-master",
     "bitness": 32,
-    "uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "python-3.7.4-32bit", "java-8.152-32bit", "emscripten-master-32bit", "binaryen-main-32bit"],
+    "uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "python-3.7.4-32bit", "java-8.152-32bit", "emscripten-main-32bit", "binaryen-main-32bit"],
     "os": "win"
   },
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "emscripten-master-64bit", "binaryen-main-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
     "os": "win"
   },
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-main-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
     "os": "macos"
   },
   {
     "version": "fastcomp-master",
     "bitness": 32,
-    "uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "emscripten-master-32bit", "binaryen-main-32bit"],
+    "uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "emscripten-main-32bit", "binaryen-main-32bit"],
     "os": "linux"
   },
   {
     "version": "fastcomp-master",
     "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "emscripten-master-64bit", "binaryen-main-64bit"],
+    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
     "os": "linux"
   },
   {

From 1fe80678a90230bf060147164859d0d1064ef5db Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 9 Mar 2021 11:13:09 -0800
Subject: [PATCH 131/161] Missing update from #746 (#751)

---
 emsdk_manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 9915b5b84f..1a2a687f39 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -407,7 +407,7 @@
   },
   {
     "id": "binaryen",
-    "version": "master",
+    "version": "main",
     "bitness": 32,
     "append_bitness": false,
     "url": "https://github.com/WebAssembly/binaryen.git",

From d3428211956919dda48d4f5621507225074e85a5 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 9 Mar 2021 16:56:27 -0800
Subject: [PATCH 132/161] Skip npm step if node_modules already exists (#640)

See https://github.com/WebAssembly/waterfall/pull/670
---
 emsdk.py     | 8 ++++++--
 test/test.py | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index e457be89ae..5545423625 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -1848,8 +1848,12 @@ def install_sdk(self):
     if getattr(self, 'custom_install_script', None) == 'emscripten_npm_install':
       # upstream tools have hardcoded paths that are not stored in emsdk_manifest.json registry
       install_path = 'upstream' if 'releases-upstream' in self.version else 'fastcomp'
-      if not emscripten_npm_install(self, os.path.join(emsdk_path(), install_path, 'emscripten')):
-        exit_with_error('post-install step failed: emscripten_npm_install')
+      emscripten_dir = os.path.join(emsdk_path(), install_path, 'emscripten')
+      # Older versions of the sdk did not include the node_modules directory
+      # and require `npm ci` to be run post-install
+      if not os.path.exists(os.path.join(emscripten_dir, 'node_modules')):
+        if not emscripten_npm_install(self, emscripten_dir):
+          exit_with_error('post-install step failed: emscripten_npm_install')
 
     print("Done installing SDK '" + str(self) + "'.")
     return True
diff --git a/test/test.py b/test/test.py
index c78858dc68..bd21154bc8 100755
--- a/test/test.py
+++ b/test/test.py
@@ -205,6 +205,10 @@ def test_tot_upstream(self):
     # TODO; test on latest as well
     check_call(upstream_emcc + ' hello_world.c')
 
+  def test_closure(self):
+    # Specificlly test with `--closure` so we know that node_modules is working
+    check_call(upstream_emcc + ' hello_world.c --closure=1')
+
   def test_specific_old(self):
     print('test specific release (old, using sdk-* notation)')
     run_emsdk('install sdk-fastcomp-1.38.31-64bit')

From 329423fea2c6a41e87d0c9b75f5800e1cf4c9dd2 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Wed, 10 Mar 2021 11:11:28 -0800
Subject: [PATCH 133/161] Remove "fastcomp-master" SDKs from
 emsdk_manifest.json (#752)

It makes not sense to install fastcomp with the current main
branch of binaryen and emscripten so remove these SDK options.
---
 emsdk_manifest.json | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 1a2a687f39..b522c02e1a 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -485,36 +485,6 @@
     "uses": ["llvm-git-main-32bit", "emscripten-main-32bit", "binaryen-main-32bit"],
     "os": "linux"
   },
-  {
-    "version": "fastcomp-master",
-    "bitness": 32,
-    "uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "python-3.7.4-32bit", "java-8.152-32bit", "emscripten-main-32bit", "binaryen-main-32bit"],
-    "os": "win"
-  },
-  {
-    "version": "fastcomp-master",
-    "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
-    "os": "win"
-  },
-  {
-    "version": "fastcomp-master",
-    "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
-    "os": "macos"
-  },
-  {
-    "version": "fastcomp-master",
-    "bitness": 32,
-    "uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "emscripten-main-32bit", "binaryen-main-32bit"],
-    "os": "linux"
-  },
-  {
-    "version": "fastcomp-master",
-    "bitness": 64,
-    "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
-    "os": "linux"
-  },
   {
     "version": "fastcomp-tag-%tag%",
     "bitness": 32,

From cf2e3371cd19b248137f27fcf4ac79f8b4507e04 Mon Sep 17 00:00:00 2001
From: Mark Callow <2244683+MarkCallow@users.noreply.github.com>
Date: Wed, 10 Mar 2021 18:07:02 -0800
Subject: [PATCH 134/161] Base on Ubuntu Focal. (#747)

---
 docker/Dockerfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index e5674ea42d..c80c23c3e3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster AS stage_build
+FROM ubuntu:focal AS stage_build
 
 ARG EMSCRIPTEN_VERSION=tot
 ENV EMSDK /emsdk
@@ -56,7 +56,7 @@ RUN echo "## Aggressive optimization: Remove debug symbols" \
 # -------------------------------- STAGE DEPLOY --------------------------------
 # ------------------------------------------------------------------------------
 
-FROM debian:buster-slim AS stage_deploy
+FROM ubuntu:focal AS stage_deploy
 
 COPY --from=stage_build /emsdk /emsdk
 
@@ -86,10 +86,11 @@ RUN echo "## Create emscripten user (1000:1000)" \
 # ------------------------------------------------------------------------------
 
 RUN echo "## Update and install packages" \
-    # mitigate problem with create symlink to man for base debian image
-    && mkdir -p /usr/share/man/man1/ \
     && apt-get -qq -y update \
-    && apt-get -qq install -y --no-install-recommends \
+    # Somewhere in here apt sets up tzdata which asks for your time zone and blocks
+    # waiting for the answer which you can't give as docker build doesn't read from
+    # the terninal. The env vars set here avoid the interactive prompt and set the TZ.
+    && DEBIAN_FRONTEND="noninteractive" TZ="America/San_Francisco" apt-get -qq install -y --no-install-recommends \
         sudo \
         libxml2 \
         ca-certificates \

From 9a70fe368827c6bdcc9fa9b67841bf4967b77f18 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Wed, 10 Mar 2021 21:54:29 -0800
Subject: [PATCH 135/161] Rename sdk-upstream-master SDK to sdk-upstream-main
 (#754)

Now that all the components (binaryen, emscripten and llvm) use `main`
as the branch name is makes sense to give the SDK this name.

Keep backwards compat with the old name but issue a warning when its
used.
---
 README.md           | 22 +++++++++++-----------
 emsdk.py            | 10 ++++++----
 emsdk_manifest.json |  8 ++++----
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 8b5f5fdece..1d397e38fa 100644
--- a/README.md
+++ b/README.md
@@ -138,8 +138,8 @@ categories.
 To obtain and build latest upstream wasm SDK from source, run
 
 ```
-emsdk install sdk-upstream-master-64bit
-emsdk activate sdk-upstream-master-64bit
+emsdk install sdk-upstream-main-64bit
+emsdk activate sdk-upstream-main-64bit
 ```
 
 You can use this target for example to bootstrap developing patches to LLVM,
@@ -155,8 +155,8 @@ https://emscripten.org/docs/contributing/developers_guide.html?highlight=develop
 ### When working on git branches compiled from source, how do I update to a newer compiler version?
 
 Unlike tags and precompiled versions, a few of the SDK packages are based on
-"moving" git branches and compiled from source (e.g. sdk-upstream-master,
-sdk-master, emscripten-master, binaryen-master). Because of that, the
+"moving" git branches and compiled from source (e.g. sdk-upstream-main,
+sdk-main, emscripten-main, binaryen-main). Because of that, the
 compiled versions will eventually go out of date as new commits are introduced
 to the development branches. To update an old compiled installation of one of
 this branches, simply reissue the "emsdk install" command on that tool/SDK. This
@@ -197,11 +197,11 @@ where you directly interact with the github repositories. This allows you to
 obtain new features and latest fixes immediately as they are pushed to the
 github repository, without having to wait for release to be tagged. You do not
 need a github account or a fork of Emscripten to do this. To switch to using the
-latest upstream git development branch `master`, run the following:
+latest upstream git development branch `main`, run the following:
 
     emsdk install git-1.9.4 # Install git. Skip if the system already has it.
-    emsdk install sdk-upstream-master-64bit # Clone+pull the latest emscripten-core/emscripten/master.
-    emsdk activate sdk-upstream-master-64bit # Set the master SDK as the currently active one.
+    emsdk install sdk-upstream-main-64bit # Clone+pull the latest emscripten-core/emscripten/main.
+    emsdk activate sdk-upstream-main-64bit # Set the main SDK as the currently active one.
 
 ### How do I use my own Emscripten github fork with the SDK?
 
@@ -211,16 +211,16 @@ acquainted with working on multiple remotes in a git clone, these steps should
 be familiar to you. This is useful in the case when you want to make your own
 modifications to the Emscripten toolchain, but still keep using the SDK
 environment and tools. To set up your own fork as the currently active
-Emscripten toolchain, first install the `sdk-master` SDK like shown in the
+Emscripten toolchain, first install the `sdk-main` SDK like shown in the
 previous section, and then run the following commands in the emsdk directory:
 
-    cd emscripten/master
+    cd emscripten/main
     # Add a git remote link to your own repository.
     git remote add myremote https://github.com/mygituseraccount/emscripten.git
     # Obtain the changes in your link.
     git fetch myremote
-    # Switch the emscripten-master tool to use your fork.
-    git checkout -b mymaster --track myremote/master
+    # Switch the emscripten-main tool to use your fork.
+    git checkout -b mymain --track myremote/main
 
 In this way you can utilize the Emscripten SDK tools while using your own git
 fork. You can switch back and forth between remotes via the `git checkout`
diff --git a/emsdk.py b/emsdk.py
index 5545423625..73f10271d6 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -37,9 +37,8 @@
   from urlparse import urljoin
   from urllib2 import urlopen
 
-emsdk_master_server = 'https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/'
 
-emsdk_packages_url = emsdk_master_server
+emsdk_packages_url = 'https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/'
 
 emscripten_releases_repo = 'https://chromium.googlesource.com/emscripten-releases'
 
@@ -1717,8 +1716,8 @@ def is_installed(self, skip_version_check=False):
     # For e.g. fastcomp clang from git repo, the activated PATH is the
     # directory where the compiler is built to, and installation_path is
     # the directory where the source tree exists. To distinguish between
-    # multiple packages sharing the same source (clang-master-32bit,
-    # clang-master-64bit, clang-master-32bit and clang-master-64bit each
+    # multiple packages sharing the same source (clang-main-32bit,
+    # clang-main-64bit, clang-main-32bit and clang-main-64bit each
     # share the same git repo), require that in addition to the installation
     # directory, each item in the activated PATH must exist.
     if hasattr(self, 'activated_path') and not os.path.exists(self.expand_vars(self.activated_path)):
@@ -2588,6 +2587,9 @@ def exit_with_fastcomp_error():
 
 
 def expand_sdk_name(name, activating):
+  if 'upstream-master' in name:
+    errlog('upstream-master SDK has been renamed upstream-main')
+    name = name.replace('upstream-master', 'upstream-main')
   if name in ('latest-fastcomp', 'latest-releases-fastcomp', 'tot-fastcomp', 'sdk-nightly-latest'):
     exit_with_fastcomp_error()
   if name in ('latest', 'sdk-latest', 'latest-64bit', 'sdk-latest-64bit'):
diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index b522c02e1a..48e52980bc 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -462,25 +462,25 @@
 
   "sdks": [
   {
-    "version": "upstream-master",
+    "version": "upstream-main",
     "bitness": 64,
     "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
     "os": "win"
   },
   {
-    "version": "upstream-master",
+    "version": "upstream-main",
     "bitness": 64,
     "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
     "os": "macos"
   },
   {
-    "version": "upstream-master",
+    "version": "upstream-main",
     "bitness": 64,
     "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
     "os": "linux"
   },
   {
-    "version": "upstream-master",
+    "version": "upstream-main",
     "bitness": 32,
     "uses": ["llvm-git-main-32bit", "emscripten-main-32bit", "binaryen-main-32bit"],
     "os": "linux"

From 772d397a5512401db3c5aa606dd919bd99783844 Mon Sep 17 00:00:00 2001
From: juj <jujjyl@gmail.com>
Date: Thu, 11 Mar 2021 14:09:48 +0200
Subject: [PATCH 136/161] Fix search of VCTargetsPath for VS2019 build. (#698)

---
 emsdk.py | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index 73f10271d6..04b083eecd 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -903,7 +903,29 @@ def build_env(generator):
       path = vswhere(16)
     else:
       path = vswhere(15)
-    build_env['VCTargetsPath'] = os.path.join(path, 'Common7\\IDE\\VC\\VCTargets')
+
+    # Configuring CMake for Visual Studio needs and env. var VCTargetsPath to be present.
+    # How this is supposed to work is unfortunately very undocumented. See
+    # https://discourse.cmake.org/t/cmake-failed-to-get-the-value-of-vctargetspath-with-vs2019-16-7/1839/16
+    # for some conversation. Try a couple of common paths if one of them would work.
+    # In the future as new versions of VS come out, we likely need to add new paths into this list.
+    if 'VCTargetsPath' not in build_env:
+      vctargets_paths = [
+        os.path.join(path, 'MSBuild\\Microsoft\\VC\\v160\\'),
+        os.path.join(path, 'Common7\\IDE\\VC\\VCTargets')
+      ]
+      for p in vctargets_paths:
+        if os.path.isfile(os.path.join(p, 'Microsoft.Cpp.Default.props')):
+          debug_print('Set env. var VCTargetsPath=' + p + ' for CMake.')
+          build_env['VCTargetsPath'] = p
+          break
+        else:
+          debug_print('Searched path ' + p + ' as candidate for VCTargetsPath, not working.')
+
+      if 'VCTargetsPath' not in build_env:
+        errlog('Unable to locate Visual Studio compiler installation for generator "' + generator + '"!')
+        errlog('Either rerun installation in Visual Studio Command Prompt, or locate directory to Microsoft.Cpp.Default.props manually')
+        sys.exit(1)
 
     # CMake and VS2017 cl.exe needs to have mspdb140.dll et al. in its PATH.
     vc_bin_paths = [vs_filewhere(path, 'amd64', 'cl.exe'),

From 96d7ee1c5e2ce349add36df6165ba7b4ffc96b77 Mon Sep 17 00:00:00 2001
From: juj <jujjyl@gmail.com>
Date: Fri, 12 Mar 2021 17:29:56 +0200
Subject: [PATCH 137/161] Fix support for Apple M1 (#753)

* Fix support for Apple M1. Node.js will still run via Rosetta 2 emulation since they do not yet have M1 support, but Python, LLVM, Emscripten and Binaryen will be native.

* Update M1 python version and URL

* Remove .gitignore additions

* Move python first in the manifest (#441)

* Use macosx-version-min when building python

* Update Intel macOS python package name
---
 emsdk                    | 15 +++++++++-----
 emsdk_manifest.json      | 27 ++++++++++++++++++++++--
 scripts/update_python.py | 44 ++++++++++++++++++++++++++++++----------
 3 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/emsdk b/emsdk
index f728f1308b..98b8d84ac2 100755
--- a/emsdk
+++ b/emsdk
@@ -6,10 +6,15 @@
 
 # Wrapper script that runs emsdk.py
 
-# First look for pre-built python (macos)
+# First look for python bundled in Emsdk
 if [ -z "$EMSDK_PYTHON" ]; then
-  PYTHON3=$(dirname $0)/python/3.7.4-2_64bit/bin/python3
-  if [ -e $PYTHON3 ]; then
+  PYTHON3=$(dirname $0)/python/3.9.2-1_64bit/bin/python3
+  PYTHON3_CERT_FILE=$(dirname $0)/python/3.9.2-1_64bit/lib/python3.9/site-packages/certifi/cacert.pem
+  if [ ! -f $PYTHON3 ]; then
+    PYTHON3=$(dirname $0)/python/3.7.4-2_64bit/bin/python3
+    PYTHON3_CERT_FILE=$(dirname $0)/python/3.7.4-2_64bit/lib/python3.7/site-packages/certifi/cacert.pem
+  fi
+  if [ -f $PYTHON3 ]; then
     EMSDK_PYTHON=$PYTHON3
 
     # When using our bundled python we never want the users
@@ -21,11 +26,11 @@ if [ -z "$EMSDK_PYTHON" ]; then
     # This is needed for MacOS.  Without this, the urlopen
     # code will try to use /usr/local/etc/openssl/cert.pem
     # which may or may not exist on the system.
-    export SSL_CERT_FILE=$(dirname $0)/python/3.7.4-2_64bit/lib/python3.7/site-packages/certifi/cacert.pem
+    export SSL_CERT_FILE=$PYTHON3_CERT_FILE
   fi
 fi
 
-# Look for `python3` first.  This is especially important on macOS (See:
+# If bundled python is not found, look for `python3` in PATH.  This is especially important on macOS (See:
 # https://github.com/emscripten-core/emsdk/pull/273)
 if [ -z "$EMSDK_PYTHON" ]; then
   PYTHON3=$(which python3 2> /dev/null)
diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 48e52980bc..b556fbcd6b 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -221,6 +221,7 @@
     "version": "14.15.5",
     "arch": "aarch64",
     "bitness": 64,
+    "macos_url": "node-v14.15.5-darwin-x64.tar.gz",
     "linux_url": "node-v14.15.5-linux-arm64.tar.xz",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
@@ -289,6 +290,24 @@
     "activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
     "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.7/site-packages/certifi/cacert.pem"
   },
+  {
+    "id": "python",
+    "version": "3.9.2-1",
+    "bitness": 64,
+    "arch": "x86_64",
+    "macos_url": "python-3.9.2-1-macos-x86_64.tar.gz",
+    "activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
+    "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.9/site-packages/certifi/cacert.pem"
+  },
+  {
+    "id": "python",
+    "version": "3.9.2-1",
+    "bitness": 64,
+    "arch": "aarch64",
+    "macos_url": "python-3.9.2-1-macos-arm64.tar.gz",
+    "activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
+    "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.9/site-packages/certifi/cacert.pem"
+  },
   {
     "id": "java",
     "version": "8.152",
@@ -464,13 +483,13 @@
   {
     "version": "upstream-main",
     "bitness": 64,
-    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
+    "uses": ["python-3.7.4-pywin32-64bit", "llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
     "os": "win"
   },
   {
     "version": "upstream-main",
     "bitness": 64,
-    "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
+    "uses": ["python-3.9.2-1-64bit", "llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
     "os": "macos"
   },
   {
@@ -533,6 +552,7 @@
     "bitness": 64,
     "uses": ["node-14.15.5-64bit", "python-3.7.4-2-64bit", "releases-upstream-%releases-tag%-64bit"],
     "os": "macos",
+    "arch": "x86_64",
     "custom_install_script": "emscripten_npm_install"
   },
   {
@@ -554,6 +574,7 @@
     "bitness": 64,
     "uses": ["node-14.15.5-64bit", "python-3.7.4-2-64bit", "releases-fastcomp-%releases-tag%-64bit"],
     "os": "macos",
+    "arch": "x86_64",
     "custom_install_script": "emscripten_npm_install"
   },
   {
@@ -604,6 +625,7 @@
     "bitness": 32,
     "uses": ["fastcomp-clang-e%precompiled_tag32%-32bit", "node-8.9.1-32bit", "python-3.7.4-2-64bit", "emscripten-%precompiled_tag32%"],
     "os": "macos",
+    "arch": "x86_64",
     "version_filter": [
       ["%precompiled_tag32%", ">", "1.37.22"]
     ]
@@ -613,6 +635,7 @@
     "bitness": 64,
     "uses": ["fastcomp-clang-e%precompiled_tag64%-64bit", "node-8.9.1-64bit", "python-3.7.4-2-64bit", "emscripten-%precompiled_tag64%"],
     "os": "macos",
+    "arch": "x86_64",
     "version_filter": [
       ["%precompiled_tag64%", ">", "1.37.22"]
     ]
diff --git a/scripts/update_python.py b/scripts/update_python.py
index 10142dad3c..f7509aafc0 100755
--- a/scripts/update_python.py
+++ b/scripts/update_python.py
@@ -24,15 +24,17 @@
 import glob
 import multiprocessing
 import os
+import platform
 import urllib.request
 import shutil
 import subprocess
 import sys
 from subprocess import check_call
 
-version = '3.7.4'
+version = '3.9.2'
+major_minor_version = '.'.join(version.split('.')[:2])  # e.g. '3.9.2' -> '3.9'
 base = 'https://www.python.org/ftp/python/%s/' % version
-revision = '2'
+revision = '1'
 
 pywin32_version = '227'
 pywin32_base = 'https://github.com/mhammond/pywin32/releases/download/b%s/' % pywin32_version
@@ -42,9 +44,9 @@
 
 def make_python_patch(arch):
     if arch == 'amd64':
-      pywin32_filename = 'pywin32-%s.win-%s-py3.7.exe' % (pywin32_version, arch)
+      pywin32_filename = 'pywin32-%s.win-%s-py%s.exe' % (pywin32_version, arch, major_minor_version)
     else:
-      pywin32_filename = 'pywin32-%s.%s-py3.7.exe' % (pywin32_version, arch)
+      pywin32_filename = 'pywin32-%s.%s-py%s.exe' % (pywin32_version, arch, major_minor_version)
     filename = 'python-%s-embed-%s.zip' % (version, arch)
     out_filename = 'python-%s-embed-%s+pywin32.zip' % (version, arch)
     if not os.path.exists(pywin32_filename):
@@ -86,9 +88,21 @@ def build_python():
         osname = 'macos'
         # Take some rather drastic steps to link openssl statically
         check_call(['brew', 'install', 'openssl', 'pkg-config'])
-        os.remove('/usr/local/opt/openssl/lib/libssl.dylib')
-        os.remove('/usr/local/opt/openssl/lib/libcrypto.dylib')
-        os.environ['PKG_CONFIG_PATH'] = '/usr/local/opt/openssl/lib/pkgconfig/'
+        if platform.machine() == 'x86_64':
+            prefix = '/usr/local'
+            min_macos_version = '10.13'
+        elif platform.machine() == 'arm64':
+            prefix = '/opt/homebrew'
+            min_macos_version = '11.0'
+
+        osname += '-' + platform.machine()  # Append '-x86_64' or '-arm64' depending on current arch. (TODO: Do this for Linux too, move this below?)
+
+        try:
+            os.remove(os.path.join(prefix, 'opt', 'openssl', 'lib', 'libssl.dylib'))
+            os.remove(os.path.join(prefix, 'opt', 'openssl', 'lib', 'libcrypto.dylib'))
+        except Exception:
+            pass
+        os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'opt', 'openssl', 'lib', 'pkgconfig')
     else:
         osname = 'linux'
 
@@ -96,9 +110,14 @@ def build_python():
     if not os.path.exists(src_dir):
       check_call(['git', 'clone', 'https://github.com/python/cpython'])
     check_call(['git', 'checkout', 'v' + version], cwd=src_dir)
-    check_call(['./configure'], cwd=src_dir)
-    check_call(['make', '-j', str(multiprocessing.cpu_count())], cwd=src_dir)
-    check_call(['make', 'install', 'DESTDIR=install'], cwd=src_dir)
+
+    min_macos_version_line = '-mmacosx-version-min=' + min_macos_version  # Specify the min OS version we want the build to work on
+    build_flags = min_macos_version_line + ' -Werror=partial-availability'  # Build against latest SDK, but issue an error if using any API that would not work on the min OS version
+    env = os.environ.copy()
+    env['MACOSX_DEPLOYMENT_TARGET'] = min_macos_version
+    check_call(['./configure', 'CFLAGS=' + build_flags, 'CXXFLAGS=' + build_flags, 'LDFLAGS=' + min_macos_version_line], cwd=src_dir, env=env)
+    check_call(['make', '-j', str(multiprocessing.cpu_count())], cwd=src_dir, env=env)
+    check_call(['make', 'install', 'DESTDIR=install'], cwd=src_dir, env=env)
 
     install_dir = os.path.join(src_dir, 'install')
 
@@ -109,9 +128,12 @@ def build_python():
     check_call([pybin, pip, 'install', 'requests'])
 
     dirname = 'python-%s-%s' % (version, revision)
+    if os.path.isdir(dirname):
+        print('Erasing old build directory ' + dirname)
+        shutil.rmtree(dirname)
     os.rename(os.path.join(install_dir, 'usr', 'local'), dirname)
     tarball = 'python-%s-%s-%s.tar.gz' % (version, revision, osname)
-    shutil.rmtree(os.path.join(dirname, 'lib', 'python3.7', 'test'))
+    shutil.rmtree(os.path.join(dirname, 'lib', 'python' + major_minor_version, 'test'))
     shutil.rmtree(os.path.join(dirname, 'include'))
     for lib in glob.glob(os.path.join(dirname, 'lib', 'lib*.a')):
       os.remove(lib)

From 1a3878716fbad29f89184e270549bed9a1e8c959 Mon Sep 17 00:00:00 2001
From: Tim Talashok <t.talashok@gmail.com>
Date: Fri, 12 Mar 2021 22:28:55 +0100
Subject: [PATCH 138/161] Remove absl from wasm_binary (#756)

* Remove absl from wasm_binary

* Formatting fixes

* Blank line, too

* Reorder imports
---
 bazel/emscripten_toolchain/wasm_binary.py | 51 +++++++++++------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/bazel/emscripten_toolchain/wasm_binary.py b/bazel/emscripten_toolchain/wasm_binary.py
index 466e789e61..97df45b793 100644
--- a/bazel/emscripten_toolchain/wasm_binary.py
+++ b/bazel/emscripten_toolchain/wasm_binary.py
@@ -18,17 +18,11 @@
 WebAssembly binary into a larger web application.
 """
 
+import argparse
 import os
 import subprocess
 import sys
 
-from absl import app
-from absl import flags
-
-FLAGS = flags.FLAGS
-flags.DEFINE_string('archive', None, 'The the archive to extract from.')
-flags.DEFINE_string('output_path', None, 'The path to extract into.')
-
 
 def ensure(f):
   if not os.path.exists(f):
@@ -41,44 +35,49 @@ def check(f):
     raise Exception('Expected file in archive: %s' % f)
 
 
-def main(argv):
-  basename = os.path.basename(FLAGS.archive)
+def main():
+  parser = argparse.ArgumentParser()
+  parser.add_argument('--archive', help='The archive to extract from.')
+  parser.add_argument('--output_path', help='The path to extract into.')
+  args = parser.parse_args()
+
+  basename = os.path.basename(args.archive)
   stem = basename.split('.')[0]
 
   # Check the type of the input file
-  mimetype_bytes = subprocess.check_output(['file', '-Lb', '--mime-type', '--mime-encoding', FLAGS.archive])
+  mimetype_bytes = subprocess.check_output(['file', '-Lb', '--mime-type', '--mime-encoding', args.archive])
   mimetype = mimetype_bytes.decode(sys.stdout.encoding)
 
   # If we have a tar, extract all files. If we have just a single file, copy it.
   if 'tar' in mimetype:
     subprocess.check_call(
-        ['tar', 'xf', FLAGS.archive, '-C', FLAGS.output_path])
+        ['tar', 'xf', args.archive, '-C', args.output_path])
   elif 'binary' in mimetype:
     subprocess.check_call([
         'cp',
-        FLAGS.archive,
-        os.path.join(FLAGS.output_path, stem + '.wasm')])
+        args.archive,
+        os.path.join(args.output_path, stem + '.wasm')])
   elif 'text' in mimetype:
     subprocess.check_call([
         'cp',
-        FLAGS.archive,
-        os.path.join(FLAGS.output_path, stem + '.js')])
+        args.archive,
+        os.path.join(args.output_path, stem + '.js')])
   else:
-    subprocess.check_call(['cp', FLAGS.archive, FLAGS.output_path])
+    subprocess.check_call(['cp', args.archive, args.output_path])
 
   # At least one of these two files should exist at this point.
-  ensure(os.path.join(FLAGS.output_path, stem + '.js'))
-  ensure(os.path.join(FLAGS.output_path, stem + '.wasm'))
+  ensure(os.path.join(args.output_path, stem + '.js'))
+  ensure(os.path.join(args.output_path, stem + '.wasm'))
 
   # And can optionally contain these extra files.
-  ensure(os.path.join(FLAGS.output_path, stem + '.wasm.map'))
-  ensure(os.path.join(FLAGS.output_path, stem + '.worker.js'))
-  ensure(os.path.join(FLAGS.output_path, stem + '.js.mem'))
-  ensure(os.path.join(FLAGS.output_path, stem + '.data'))
-  ensure(os.path.join(FLAGS.output_path, stem + '.fetch.js'))
-  ensure(os.path.join(FLAGS.output_path, stem + '.js.symbols'))
-  ensure(os.path.join(FLAGS.output_path, stem + '.wasm.debug.wasm'))
+  ensure(os.path.join(args.output_path, stem + '.wasm.map'))
+  ensure(os.path.join(args.output_path, stem + '.worker.js'))
+  ensure(os.path.join(args.output_path, stem + '.js.mem'))
+  ensure(os.path.join(args.output_path, stem + '.data'))
+  ensure(os.path.join(args.output_path, stem + '.fetch.js'))
+  ensure(os.path.join(args.output_path, stem + '.js.symbols'))
+  ensure(os.path.join(args.output_path, stem + '.wasm.debug.wasm'))
 
 
 if __name__ == '__main__':
-  app.run(main)
+  main()

From 1ee4a9c5bebb84461dbfb0c62980b7143f655df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Sun, 14 Mar 2021 18:43:16 +0100
Subject: [PATCH 139/161] Fix GitHub repo url in emsdk_manifest.json (#757)

It was still using the old repo location which was moved to the emscripten-core organization.
---
 emsdk_manifest.json | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index b556fbcd6b..379545a211 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -34,10 +34,10 @@
     "version": "tag-e%tag%",
     "bitness": 32,
     "append_bitness": false,
-    "windows_url": "https://github.com/kripken/emscripten-fastcomp/archive/%tag%.zip",
-    "unix_url": "https://github.com/kripken/emscripten-fastcomp/archive/%tag%.tar.gz",
-    "windows_clang_url": "https://github.com/kripken/emscripten-fastcomp-clang/archive/%tag%.zip",
-    "unix_clang_url": "https://github.com/kripken/emscripten-fastcomp-clang/archive/%tag%.tar.gz",
+    "windows_url": "https://github.com/emscripten-core/emscripten-fastcomp/archive/%tag%.zip",
+    "unix_url": "https://github.com/emscripten-core/emscripten-fastcomp/archive/%tag%.tar.gz",
+    "windows_clang_url": "https://github.com/emscripten-core/emscripten-fastcomp-clang/archive/%tag%.zip",
+    "unix_clang_url": "https://github.com/emscripten-core/emscripten-fastcomp-clang/archive/%tag%.tar.gz",
     "custom_install_script": "build_fastcomp",
     "activated_path": "%installation_dir%/%fastcomp_build_bin_dir%",
     "activated_cfg": "LLVM_ROOT='%installation_dir%/%fastcomp_build_bin_dir%'",
@@ -49,10 +49,10 @@
     "version": "tag-e%tag%",
     "bitness": 64,
     "append_bitness": false,
-    "windows_url": "https://github.com/kripken/emscripten-fastcomp/archive/%tag%.zip",
-    "unix_url": "https://github.com/kripken/emscripten-fastcomp/archive/%tag%.tar.gz",
-    "windows_clang_url": "https://github.com/kripken/emscripten-fastcomp-clang/archive/%tag%.zip",
-    "unix_clang_url": "https://github.com/kripken/emscripten-fastcomp-clang/archive/%tag%.tar.gz",
+    "windows_url": "https://github.com/emscripten-core/emscripten-fastcomp/archive/%tag%.zip",
+    "unix_url": "https://github.com/emscripten-core/emscripten-fastcomp/archive/%tag%.tar.gz",
+    "windows_clang_url": "https://github.com/emscripten-core/emscripten-fastcomp-clang/archive/%tag%.zip",
+    "unix_clang_url": "https://github.com/emscripten-core/emscripten-fastcomp-clang/archive/%tag%.tar.gz",
     "custom_install_script": "build_fastcomp",
     "activated_path": "%installation_dir%/%fastcomp_build_bin_dir%",
     "activated_cfg": "LLVM_ROOT='%installation_dir%/%fastcomp_build_bin_dir%'",
@@ -64,8 +64,8 @@
     "version": "master",
     "bitness": 32,
     "install_path": "clang/fastcomp",
-    "url": "https://github.com/kripken/emscripten-fastcomp.git",
-    "clang_url": "https://github.com/kripken/emscripten-fastcomp-clang.git",
+    "url": "https://github.com/emscripten-core/emscripten-fastcomp.git",
+    "clang_url": "https://github.com/emscripten-core/emscripten-fastcomp-clang.git",
     "git_branch": "master",
     "custom_install_script": "build_fastcomp",
     "activated_path": "%installation_dir%/%fastcomp_build_bin_dir%",
@@ -79,8 +79,8 @@
     "bitness": 64,
     "install_path": "clang/fastcomp",
     "git_branch": "master",
-    "url": "https://github.com/kripken/emscripten-fastcomp.git",
-    "clang_url": "https://github.com/kripken/emscripten-fastcomp-clang.git",
+    "url": "https://github.com/emscripten-core/emscripten-fastcomp.git",
+    "clang_url": "https://github.com/emscripten-core/emscripten-fastcomp-clang.git",
     "custom_install_script": "build_fastcomp",
     "activated_path": "%installation_dir%/%fastcomp_build_bin_dir%",
     "activated_cfg": "LLVM_ROOT='%installation_dir%/%fastcomp_build_bin_dir%'",
@@ -331,8 +331,8 @@
     "version": "tag-%tag%",
     "bitness": 32,
     "append_bitness": false,
-    "windows_url": "https://github.com/kripken/emscripten/archive/%tag%.zip",
-    "unix_url": "https://github.com/kripken/emscripten/archive/%tag%.tar.gz",
+    "windows_url": "https://github.com/emscripten-core/emscripten/archive/%tag%.zip",
+    "unix_url": "https://github.com/emscripten-core/emscripten/archive/%tag%.tar.gz",
     "zipfile_prefix": "emscripten-e",
     "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%%generator_prefix%_32bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%'",
     "activated_path": "%installation_dir%",
@@ -347,8 +347,8 @@
     "version": "tag-%tag%",
     "bitness": 64,
     "append_bitness": false,
-    "windows_url": "https://github.com/kripken/emscripten/archive/%tag%.zip",
-    "unix_url": "https://github.com/kripken/emscripten/archive/%tag%.tar.gz",
+    "windows_url": "https://github.com/emscripten-core/emscripten/archive/%tag%.zip",
+    "unix_url": "https://github.com/emscripten-core/emscripten/archive/%tag%.tar.gz",
     "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%%generator_prefix%_64bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%'",
     "activated_path": "%installation_dir%",
     "activated_env": "EMSCRIPTEN=%installation_dir%;EMSCRIPTEN_NATIVE_OPTIMIZER=%installation_dir%%generator_prefix%_64bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%",
@@ -360,8 +360,8 @@
   {
     "id": "emscripten",
     "version": "%precompiled_tag%",
-    "windows_url": "https://github.com/kripken/emscripten/archive/%precompiled_tag%.zip",
-    "unix_url": "https://github.com/kripken/emscripten/archive/%precompiled_tag%.tar.gz",
+    "windows_url": "https://github.com/emscripten-core/emscripten/archive/%precompiled_tag%.zip",
+    "unix_url": "https://github.com/emscripten-core/emscripten/archive/%precompiled_tag%.tar.gz",
     "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%'",
     "activated_path": "%installation_dir%",
     "activated_env": "EMSCRIPTEN=%installation_dir%"

From 9c65611d96e68081f7c146012f5ede31e7de4d73 Mon Sep 17 00:00:00 2001
From: juj <jujjyl@gmail.com>
Date: Mon, 15 Mar 2021 09:15:26 +0200
Subject: [PATCH 140/161] Ccache (#711)

* Add support for ccache.

* Simplify ccache activation.

* Fix macOS ccache build

* Make ccache executable

* Add Ninja build support. Change ccache name to git.

* Fix merge conflict
---
 emsdk.py            | 111 +++++++++++++++++++++++++++++++++++++++++++-
 emsdk_manifest.json |  23 +++++++++
 2 files changed, 133 insertions(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index 04b083eecd..97a3fd225e 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -1229,6 +1229,111 @@ def build_llvm(tool):
   return success
 
 
+def build_ninja(tool):
+  debug_print('build_ninja(' + str(tool) + ')')
+  root = os.path.normpath(tool.installation_path())
+  src_root = os.path.join(root, 'src')
+  success = git_clone_checkout_and_pull(tool.download_url(), src_root, tool.git_branch)
+  if not success:
+    return False
+
+  build_dir = llvm_build_dir(tool)
+  build_root = os.path.join(root, build_dir)
+
+  build_type = decide_cmake_build_type(tool)
+
+  # Configure
+  cmake_generator = CMAKE_GENERATOR
+  args = []
+  if 'Visual Studio 16' in CMAKE_GENERATOR:  # VS2019
+    # With Visual Studio 16 2019, CMake changed the way they specify target arch.
+    # Instead of appending it into the CMake generator line, it is specified
+    # with a -A arch parameter.
+    args += ['-A', 'x64' if tool.bitness == 64 else 'x86']
+    args += ['-Thost=x64']
+  elif 'Visual Studio' in CMAKE_GENERATOR and tool.bitness == 64:
+    cmake_generator += ' Win64'
+    args += ['-Thost=x64']
+
+  cmakelists_dir = os.path.join(src_root)
+  success = cmake_configure(cmake_generator, build_root, cmakelists_dir, build_type, args)
+  if not success:
+    return False
+
+  # Make
+  success = make_build(build_root, build_type, 'x64' if tool.bitness == 64 else 'Win32')
+
+  if success:
+    bin_dir = os.path.join(root, 'bin')
+    mkdir_p(bin_dir)
+    exe_paths = [os.path.join(build_root, 'Release', 'ninja'), os.path.join(build_root, 'ninja')]
+    for e in exe_paths:
+      for s in ['.exe', '']:
+        ninja = e + s
+        if os.path.isfile(ninja):
+          dst = os.path.join(bin_dir, 'ninja' + s)
+          shutil.copyfile(ninja, dst)
+          os.chmod(dst, os.stat(dst).st_mode | stat.S_IEXEC)
+
+  return success
+
+
+def build_ccache(tool):
+  debug_print('build_ccache(' + str(tool) + ')')
+  root = os.path.normpath(tool.installation_path())
+  src_root = os.path.join(root, 'src')
+  success = git_clone_checkout_and_pull(tool.download_url(), src_root, tool.git_branch)
+  if not success:
+    return False
+
+  build_dir = llvm_build_dir(tool)
+  build_root = os.path.join(root, build_dir)
+
+  build_type = decide_cmake_build_type(tool)
+
+  # Configure
+  cmake_generator = CMAKE_GENERATOR
+  args = ['-DZSTD_FROM_INTERNET=ON']
+  if 'Visual Studio 16' in CMAKE_GENERATOR:  # VS2019
+    # With Visual Studio 16 2019, CMake changed the way they specify target arch.
+    # Instead of appending it into the CMake generator line, it is specified
+    # with a -A arch parameter.
+    args += ['-A', 'x64' if tool.bitness == 64 else 'x86']
+    args += ['-Thost=x64']
+  elif 'Visual Studio' in CMAKE_GENERATOR and tool.bitness == 64:
+    cmake_generator += ' Win64'
+    args += ['-Thost=x64']
+
+  cmakelists_dir = os.path.join(src_root)
+  success = cmake_configure(cmake_generator, build_root, cmakelists_dir, build_type, args)
+  if not success:
+    return False
+
+  # Make
+  success = make_build(build_root, build_type, 'x64' if tool.bitness == 64 else 'Win32')
+
+  if success:
+    bin_dir = os.path.join(root, 'bin')
+    mkdir_p(bin_dir)
+    exe_paths = [os.path.join(build_root, 'Release', 'ccache'), os.path.join(build_root, 'ccache')]
+    for e in exe_paths:
+      for s in ['.exe', '']:
+        ccache = e + s
+        if os.path.isfile(ccache):
+          dst = os.path.join(bin_dir, 'ccache' + s)
+          shutil.copyfile(ccache, dst)
+          os.chmod(dst, os.stat(dst).st_mode | stat.S_IEXEC)
+
+    cache_dir = os.path.join(root, 'cache')
+    open(os.path.join(root, 'emcc_ccache.conf'), 'w').write('''# Set maximum cache size to 10 GB:
+max_size = 10G
+cache_dir = %s
+''' % cache_dir)
+    mkdir_p(cache_dir)
+
+  return success
+
+
 # Emscripten asm.js optimizer build scripts:
 def optimizer_build_root(tool):
   build_root = tool.installation_path().strip()
@@ -1898,6 +2003,10 @@ def install_tool(self):
       success = build_fastcomp(self)
     elif hasattr(self, 'custom_install_script') and self.custom_install_script == 'build_llvm':
       success = build_llvm(self)
+    elif hasattr(self, 'custom_install_script') and self.custom_install_script == 'build_ninja':
+      success = build_ninja(self)
+    elif hasattr(self, 'custom_install_script') and self.custom_install_script == 'build_ccache':
+      success = build_ccache(self)
     elif hasattr(self, 'git_branch'):
       success = git_clone_checkout_and_pull(url, self.installation_path(), self.git_branch)
     elif url.endswith(ARCHIVE_SUFFIXES):
@@ -1925,7 +2034,7 @@ def install_tool(self):
         success = emscripten_post_install(self)
       elif self.custom_install_script == 'emscripten_npm_install':
         success = emscripten_npm_install(self, self.installation_path())
-      elif self.custom_install_script in ('build_fastcomp', 'build_llvm'):
+      elif self.custom_install_script in ('build_fastcomp', 'build_llvm', 'build_ninja', 'build_ccache'):
         # 'build_fastcomp' is a special one that does the download on its
         # own, others do the download manually.
         pass
diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 379545a211..b0000e0dde 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -476,6 +476,29 @@
     "windows_url": "mingw_7.1.0_64bit.zip",
     "activated_cfg": "MINGW_ROOT='%installation_dir%'",
     "activated_path": "%installation_dir%/bin"
+  },
+  {
+    "id": "ninja",
+    "version": "git-release",
+    "bitness": 64,
+    "url": "https://github.com/ninja-build/ninja.git",
+    "git_branch": "release",
+    "activated_cfg": "NINJA=%installation_dir%/bin",
+    "activated_path": "%installation_dir%/bin",
+    "cmake_build_type": "Release",
+    "custom_install_script": "build_ninja"
+  },
+  {
+    "id": "ccache",
+    "version": "git-emscripten",
+    "bitness": 64,
+    "url": "https://github.com/juj/ccache.git",
+    "git_branch": "emscripten",
+    "activated_cfg": "EMCC_CCACHE=1",
+    "activated_path": "%installation_dir%/bin",
+    "activated_env": "EMCC_CCACHE=1;CCACHE_CONFIGPATH=%installation_dir%/emcc_ccache.conf",
+    "cmake_build_type": "Release",
+    "custom_install_script": "build_ccache"
   }
   ],
 

From 0fe3d48f2226566da80a55488c720b43c889c0f2 Mon Sep 17 00:00:00 2001
From: juj <jujjyl@gmail.com>
Date: Tue, 16 Mar 2021 09:43:02 +0200
Subject: [PATCH 141/161] Update to python 3.9.2 on Windows as well. Mark old
 Python and Node packages. (#758)

---
 README.md                |  3 ++-
 emsdk.bat                |  7 ++++++
 emsdk.ps1                |  1 +
 emsdk_manifest.json      | 48 ++++++++++++++++++++++++++++------------
 scripts/update_python.py | 36 ++++++++++++++++++++++--------
 5 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 1d397e38fa..3d10f87613 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,8 @@ https://emscripten.org/docs/building_from_source/toolchain_what_is_needed.html.
 
 ### Mac OS X
 
-- `python`: Version 2.7.0 or above.
+- For Intel-based Macs, macOS 10.13 or newer. For ARM64 M1 based Macs, macOS
+  11.0 or newer.
 - `java`: For running closure compiler (optional).  After installing emscripten
   via emsdk, typing 'emcc --help' should pop up a OS X dialog "Java is not
   installed. To open java, you need a Java SE 6 runtime. Would you like to
diff --git a/emsdk.bat b/emsdk.bat
index 66f6d11791..70e6b709b5 100644
--- a/emsdk.bat
+++ b/emsdk.bat
@@ -7,6 +7,13 @@ setlocal
 :: When using our bundled python we never want the users
 :: PYTHONHOME or PYTHONPATH
 :: https://github.com/emscripten-core/emsdk/issues/598
+if exist "%~dp0python\3.9.2-1_64bit\python.exe" (
+  set EMSDK_PY="%~dp0python\3.9.2-1_64bit\python.exe"
+  set PYTHONHOME=
+  set PYTHONPATH=
+  goto end
+)
+
 if exist "%~dp0python\3.7.4-pywin32_64bit\python.exe" (
   set EMSDK_PY="%~dp0python\3.7.4-pywin32_64bit\python.exe"
   set PYTHONHOME=
diff --git a/emsdk.ps1 b/emsdk.ps1
index 694d8fe408..f9ec03655a 100644
--- a/emsdk.ps1
+++ b/emsdk.ps1
@@ -1,6 +1,7 @@
 $ScriptDirectory = Split-Path -parent $PSCommandPath
 
 $PythonLocations = $(
+    "python\3.9.2-1_64bit\python.exe",
     "python\3.7.4-pywin32_64bit\python.exe",
     "python\3.7.4_64bit\python.exe",
     "python\2.7.13.1_64bit\python-2.7.13.amd64\python.exe",
diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index b0000e0dde..c344458644 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -150,7 +150,8 @@
     "linux_url": "node-v8.9.1-linux-x86.tar.xz",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
-    "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
+    "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%",
+    "is_old": true
   },
   {
     "id": "node",
@@ -160,7 +161,8 @@
     "linux_url": "https://nodejs.org/dist/v8.9.1/node-v8.9.1-linux-armv7l.tar.xz",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
-    "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
+    "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%",
+    "is_old": true
   },
   {
     "id": "node",
@@ -172,7 +174,8 @@
     "linux_url": "node-v8.9.1-linux-x64.tar.xz",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
-    "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
+    "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%",
+    "is_old": true
   },
   {
     "id": "node",
@@ -182,7 +185,8 @@
     "linux_url": "node-v8.9.1-linux-arm64.tar.xz",
     "activated_path": "%installation_dir%/bin",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
-    "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
+    "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%",
+    "is_old": true
   },
   {
     "id": "node",
@@ -234,7 +238,8 @@
     "arch": "x86",
     "windows_url": "WinPython-32bit-2.7.13.1Zero.zip",
     "activated_cfg": "PYTHON='%installation_dir%/python-2.7.13/python%.exe%'",
-    "activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13/python%.exe%"
+    "activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13/python%.exe%",
+    "is_old": true
   },
   {
     "id": "python",
@@ -243,7 +248,8 @@
     "arch": "x86_64",
     "windows_url": "WinPython-64bit-2.7.13.1Zero.zip",
     "activated_cfg": "PYTHON='%installation_dir%/python-2.7.13.amd64/python%.exe%'",
-    "activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13.amd64/python%.exe%"
+    "activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13.amd64/python%.exe%",
+    "is_old": true
   },
   {
     "id": "python",
@@ -252,7 +258,8 @@
     "arch": "x86",
     "windows_url": "python-3.7.4-embed-win32-patched.zip",
     "activated_cfg": "PYTHON='%installation_dir%/python.exe'",
-    "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
+    "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe",
+    "is_old": true
   },
   {
     "id": "python",
@@ -261,7 +268,8 @@
     "arch": "x86_64",
     "windows_url": "python-3.7.4-embed-amd64-patched.zip",
     "activated_cfg": "PYTHON='%installation_dir%/python.exe'",
-    "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
+    "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe",
+    "is_old": true
   },
   {
     "id": "python",
@@ -270,7 +278,8 @@
     "arch": "x86",
     "windows_url": "python-3.7.4-embed-win32+pywin32.zip",
     "activated_cfg": "PYTHON='%installation_dir%/python.exe'",
-    "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
+    "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe",
+    "is_old": true
   },
   {
     "id": "python",
@@ -279,7 +288,8 @@
     "arch": "x86_64",
     "windows_url": "python-3.7.4-embed-amd64+pywin32.zip",
     "activated_cfg": "PYTHON='%installation_dir%/python.exe'",
-    "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
+    "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe",
+    "is_old": true
   },
   {
     "id": "python",
@@ -288,7 +298,17 @@
     "arch": "x86_64",
     "macos_url": "python-3.7.4-2-macos.tar.gz",
     "activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
-    "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.7/site-packages/certifi/cacert.pem"
+    "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.7/site-packages/certifi/cacert.pem",
+    "is_old": true
+  },
+  {
+    "id": "python",
+    "version": "3.9.2-1",
+    "bitness": 64,
+    "arch": "x86_64",
+    "windows_url": "python-3.9.2-1-embed-amd64+pywin32.zip",
+    "activated_cfg": "PYTHON='%installation_dir%/python.exe'",
+    "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe"
   },
   {
     "id": "python",
@@ -506,7 +526,7 @@
   {
     "version": "upstream-main",
     "bitness": 64,
-    "uses": ["python-3.7.4-pywin32-64bit", "llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
+    "uses": ["python-3.9.2-1-64bit", "llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
     "os": "win"
   },
   {
@@ -573,7 +593,7 @@
   {
     "version": "releases-upstream-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-14.15.5-64bit", "python-3.7.4-2-64bit", "releases-upstream-%releases-tag%-64bit"],
+    "uses": ["node-14.15.5-64bit", "python-3.9.2-1-64bit", "releases-upstream-%releases-tag%-64bit"],
     "os": "macos",
     "arch": "x86_64",
     "custom_install_script": "emscripten_npm_install"
@@ -581,7 +601,7 @@
   {
     "version": "releases-upstream-%releases-tag%",
     "bitness": 64,
-    "uses": ["node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
+    "uses": ["node-14.15.5-64bit", "python-3.9.2-1-64bit", "java-8.152-64bit", "releases-upstream-%releases-tag%-64bit"],
     "os": "win",
     "custom_install_script": "emscripten_npm_install"
   },
diff --git a/scripts/update_python.py b/scripts/update_python.py
index f7509aafc0..390aa71521 100755
--- a/scripts/update_python.py
+++ b/scripts/update_python.py
@@ -42,13 +42,31 @@
 upload_base = 'gs://webassembly/emscripten-releases-builds/deps/'
 
 
+def unzip_cmd():
+    # Use 7-Zip if available (https://www.7-zip.org/)
+    sevenzip = os.path.join(os.getenv('ProgramFiles'), '7-Zip', '7z.exe')
+    if os.path.isfile(sevenzip):
+        return [sevenzip, 'x']
+    # Fall back to 'unzip' tool
+    return ['unzip', '-q']
+
+
+def zip_cmd():
+    # Use 7-Zip if available (https://www.7-zip.org/)
+    sevenzip = os.path.join(os.getenv('ProgramFiles'), '7-Zip', '7z.exe')
+    if os.path.isfile(sevenzip):
+        return [sevenzip, 'a', '-mx9']
+    # Fall back to 'zip' tool
+    return ['zip', '-rq']
+
+
 def make_python_patch(arch):
     if arch == 'amd64':
       pywin32_filename = 'pywin32-%s.win-%s-py%s.exe' % (pywin32_version, arch, major_minor_version)
     else:
       pywin32_filename = 'pywin32-%s.%s-py%s.exe' % (pywin32_version, arch, major_minor_version)
     filename = 'python-%s-embed-%s.zip' % (version, arch)
-    out_filename = 'python-%s-embed-%s+pywin32.zip' % (version, arch)
+    out_filename = 'python-%s-%s-embed-%s+pywin32.zip' % (version, revision, arch)
     if not os.path.exists(pywin32_filename):
         download_url = pywin32_base + pywin32_filename
         print('Downloading pywin32: ' + download_url)
@@ -60,17 +78,21 @@ def make_python_patch(arch):
         urllib.request.urlretrieve(download_url, filename)
 
     os.mkdir('python-embed')
-    check_call(['unzip', '-q', os.path.abspath(filename)], cwd='python-embed')
-    os.remove(os.path.join('python-embed', 'python37._pth'))
+    check_call(unzip_cmd() + [os.path.abspath(filename)], cwd='python-embed')
+    os.remove(os.path.join('python-embed', 'python%s._pth' % major_minor_version.replace('.', '')))
 
     os.mkdir('pywin32')
-    rtn = subprocess.call(['unzip', '-q', os.path.abspath(pywin32_filename)], cwd='pywin32')
+    rtn = subprocess.call(unzip_cmd() + [os.path.abspath(pywin32_filename)], cwd='pywin32')
     assert rtn in [0, 1]
 
     os.mkdir(os.path.join('python-embed', 'lib'))
     shutil.move(os.path.join('pywin32', 'PLATLIB'), os.path.join('python-embed', 'lib', 'site-packages'))
 
-    check_call(['zip', '-rq', os.path.join('..', out_filename), '.'], cwd='python-embed')
+    check_call(zip_cmd() + [os.path.join('..', out_filename), '.'], cwd='python-embed')
+
+    # cleanup if everything went fine
+    shutil.rmtree('python-embed')
+    shutil.rmtree('pywin32')
 
     upload_url = upload_base + out_filename
     print('Uploading: ' + upload_url)
@@ -78,10 +100,6 @@ def make_python_patch(arch):
     print(' '.join(cmd))
     check_call(cmd)
 
-    # cleanup if everything went fine
-    shutil.rmtree('python-embed')
-    shutil.rmtree('pywin32')
-
 
 def build_python():
     if sys.platform.startswith('darwin'):

From ac98ca38822a865cd6c0eb225309ed62aea5e1e5 Mon Sep 17 00:00:00 2001
From: juj <jujjyl@gmail.com>
Date: Wed, 17 Mar 2021 17:26:19 +0200
Subject: [PATCH 142/161] Rename EMCC_CCACHE to _EMCC_CCACHE. (#762)

---
 emsdk_manifest.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index c344458644..21b4508c2c 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -514,9 +514,8 @@
     "bitness": 64,
     "url": "https://github.com/juj/ccache.git",
     "git_branch": "emscripten",
-    "activated_cfg": "EMCC_CCACHE=1",
     "activated_path": "%installation_dir%/bin",
-    "activated_env": "EMCC_CCACHE=1;CCACHE_CONFIGPATH=%installation_dir%/emcc_ccache.conf",
+    "activated_env": "_EMCC_CCACHE=1;CCACHE_CONFIGPATH=%installation_dir%/emcc_ccache.conf",
     "cmake_build_type": "Release",
     "custom_install_script": "build_ccache"
   }

From 848260ed5886488339645879a96dfc7d8f570693 Mon Sep 17 00:00:00 2001
From: walkingeyerobot <mitch@thefoley.net>
Date: Sun, 21 Mar 2021 20:08:54 -0400
Subject: [PATCH 143/161] Bazel add html support (#765)

* allow the bazel toolchain to output html files

* allow for cc_binary rule names to end in .js

* fix python name

* continue to call emcc instead of em++ for now

* small cleanup

Co-authored-by: Mitch Foley <mitchfoley@chromium.org>
---
 bazel/emscripten_toolchain/crosstool.bzl      | 10 +++
 bazel/emscripten_toolchain/link_wrapper.py    | 73 ++++++++++++-------
 bazel/emscripten_toolchain/wasm_binary.py     |  1 +
 bazel/emscripten_toolchain/wasm_cc_binary.bzl |  2 +
 4 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/bazel/emscripten_toolchain/crosstool.bzl b/bazel/emscripten_toolchain/crosstool.bzl
index 0da1cb0175..10c15cb1f3 100644
--- a/bazel/emscripten_toolchain/crosstool.bzl
+++ b/bazel/emscripten_toolchain/crosstool.bzl
@@ -436,6 +436,11 @@ def _impl(ctx):
         # https://emscripten.org/docs/debugging/Sanitizers.html
         feature(name = "wasm_asan"),
         feature(name = "wasm_ubsan"),
+
+        feature(
+            name = "output_format_js",
+            enabled = True,
+        ),
     ]
 
     crosstool_default_flag_sets = [
@@ -547,6 +552,11 @@ def _impl(ctx):
             flags = ["-s", "PRINTF_LONG_DOUBLE=1"],
             features = ["precise_long_double_printf"],
         ),
+        flag_set(
+            actions = all_link_actions,
+            flags = ["--oformat=js"],
+            features = ["output_format_js"],
+        ),
 
         # Opt
         flag_set(
diff --git a/bazel/emscripten_toolchain/link_wrapper.py b/bazel/emscripten_toolchain/link_wrapper.py
index a746ae8fd3..1e26bde7f5 100644
--- a/bazel/emscripten_toolchain/link_wrapper.py
+++ b/bazel/emscripten_toolchain/link_wrapper.py
@@ -3,19 +3,20 @@
 
 This wrapper currently serves the following purposes.
 
-1. Ensures we always link to file with .js extension. The upstream default
-   it to link to an llvm bitcode file which is never (AFAICT) want to do that.
-
-2. When building with --config=wasm the final output is multiple files, usually
+1. When building with --config=wasm the final output is multiple files, usually
    at least one .js and one .wasm file. Since the cc_binary link step only
    allows a single output, we must tar up the outputs into a single file.
 
-3. Add quotes around arguments that need them in the response file to work
+2. Add quotes around arguments that need them in the response file to work
    around a bazel quirk.
+
+3. Ensure the external_debug_info section of the wasm points at the correct
+   bazel path.
 """
 
 from __future__ import print_function
 
+import argparse
 import os
 import subprocess
 import sys
@@ -25,20 +26,8 @@
 param_filename = sys.argv[1][1:]
 param_file_args = [l.strip() for l in open(param_filename, 'r').readlines()]
 
-output_index = param_file_args.index('-o') + 1
-orig_output = js_output = param_file_args[output_index]
-outdir = os.path.dirname(orig_output)
-
-# google3-only(TODO(b/139440956): Default to False once the bug is fixed)
-replace_response_file = any(' ' in a for a in param_file_args)
-
-if not os.path.splitext(orig_output)[1]:
-  js_output = orig_output + '.js'
-  param_file_args[output_index] = js_output
-  replace_response_file = True
-
 # Re-write response file if needed.
-if replace_response_file:
+if any(' ' in a for a in param_file_args):
   new_param_filename = param_filename + '.modified'
   with open(new_param_filename, 'w') as f:
     for param in param_file_args:
@@ -54,8 +43,41 @@
 if rtn != 0:
   sys.exit(1)
 
-js_name = os.path.basename(js_output)
-base_name = os.path.splitext(js_name)[0]
+# Parse the arguments that we gave to the linker to determine what the output
+# file is named and what the output format is.
+parser = argparse.ArgumentParser(add_help=False)
+parser.add_argument('-o')
+parser.add_argument('--oformat')
+options = parser.parse_known_args(param_file_args)[0]
+output_file = options.o
+oformat = options.oformat
+outdir = os.path.dirname(output_file)
+base_name = os.path.basename(output_file)
+
+# The output file name is the name of the build rule that was built.
+# Add an appropriate file extension based on --oformat.
+if oformat is not None:
+  base_name_split = os.path.splitext(base_name)
+
+  # If the output name has no extension, give it the appropriate extension.
+  if not base_name_split[1]:
+    os.rename(output_file, output_file + '.' + oformat)
+
+  # If the output name does have an extension and it matches the output format,
+  # change the base_name so it doesn't have an extension.
+  elif base_name_split[1] == '.' + oformat:
+    base_name = base_name_split[0]
+
+  # If the output name does have an extension and it does not match the output
+  # format, change the base_name so it doesn't have an extension and rename
+  # the output_file so it has the proper extension.
+  # Note that if you do something like name your build rule "foo.js" and pass
+  # "--oformat=html", emscripten will write to the same file for both the js and
+  # html output, overwriting the js output entirely with the html.
+  # Please don't do that.
+  else:
+    base_name = base_name_split[0]
+    os.rename(output_file, os.path.join(outdir, base_name + '.' + oformat))
 
 files = []
 extensions = [
@@ -67,7 +89,8 @@
     '.worker.js',
     '.data',
     '.js.symbols',
-    '.wasm.debug.wasm'
+    '.wasm.debug.wasm',
+    '.html'
 ]
 
 for ext in extensions:
@@ -112,7 +135,7 @@
         binary_part = '1' + binary_part
       final_bytes.append(int(binary_part, 2))
     # Finally, add the actual filename.
-    final_bytes.extend(base_name + '.wasm.debug.wasm')
+    final_bytes.extend((base_name + '.wasm.debug.wasm').encode())
 
     # Write our length + filename bytes to a temp file.
     with open('debugsection.tmp', 'wb+') as f:
@@ -134,11 +157,11 @@
 if len(files) > 1:
   cmd = ['tar', 'cf', 'tmp.tar'] + files
   subprocess.check_call(cmd, cwd=outdir)
-  os.rename(os.path.join(outdir, 'tmp.tar'), orig_output)
+  os.rename(os.path.join(outdir, 'tmp.tar'), output_file)
 elif len(files) == 1:
   # Otherwise, if only have a single output than move it to the expected name
-  if files[0] != os.path.basename(orig_output):
-    os.rename(os.path.join(outdir, files[0]), orig_output)
+  if files[0] != os.path.basename(output_file):
+    os.rename(os.path.join(outdir, files[0]), output_file)
 else:
   print('emcc.py did not appear to output any known files!')
   sys.exit(1)
diff --git a/bazel/emscripten_toolchain/wasm_binary.py b/bazel/emscripten_toolchain/wasm_binary.py
index 97df45b793..641c0d6f28 100644
--- a/bazel/emscripten_toolchain/wasm_binary.py
+++ b/bazel/emscripten_toolchain/wasm_binary.py
@@ -77,6 +77,7 @@ def main():
   ensure(os.path.join(args.output_path, stem + '.fetch.js'))
   ensure(os.path.join(args.output_path, stem + '.js.symbols'))
   ensure(os.path.join(args.output_path, stem + '.wasm.debug.wasm'))
+  ensure(os.path.join(args.output_path, stem + '.html'))
 
 
 if __name__ == '__main__':
diff --git a/bazel/emscripten_toolchain/wasm_cc_binary.bzl b/bazel/emscripten_toolchain/wasm_cc_binary.bzl
index 01780e2cd4..9128b7a6ab 100644
--- a/bazel/emscripten_toolchain/wasm_cc_binary.bzl
+++ b/bazel/emscripten_toolchain/wasm_cc_binary.bzl
@@ -74,6 +74,7 @@ def _wasm_binary_impl(ctx):
         ctx.outputs.data,
         ctx.outputs.symbols,
         ctx.outputs.dwarf,
+        ctx.outputs.html,
     ]
 
     ctx.actions.run(
@@ -103,6 +104,7 @@ def _wasm_binary_outputs(name, cc_target):
         "data": "{}/{}.data".format(name, basename),
         "symbols": "{}/{}.js.symbols".format(name, basename),
         "dwarf": "{}/{}.wasm.debug.wasm".format(name, basename),
+        "html": "{}/{}.html".format(name, basename),
     }
 
     return outputs

From b85548d0dd72cb1df3976a630874a58d60442a34 Mon Sep 17 00:00:00 2001
From: Jia Yuan Lo <jylo06g@gmail.com>
Date: Tue, 23 Mar 2021 02:36:54 +0800
Subject: [PATCH 144/161] List "Release" as the default build option (#770)

This was set back in commit cea44f475af10c6fde85d4906111a39818e3f134

Fixes #760
---
 emsdk.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index 97a3fd225e..bf4986a884 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2806,7 +2806,7 @@ def main(args):
                   --build=<type>: Controls what kind of build of LLVM to
                                   perform. Pass either 'Debug', 'Release',
                                   'MinSizeRel' or 'RelWithDebInfo'. Default:
-                                  'RelWithDebInfo'.
+                                  'Release'.
 
               --generator=<type>: Specifies the CMake Generator to be used
                                   during the build. Possible values are the

From fdda8524ce0c33da847a1b7bc9b0cbffe8f7192f Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Mon, 22 Mar 2021 14:07:34 -0700
Subject: [PATCH 145/161] Simplify the notation for installing by hash to just
 emsdk install HASH (#767)

Previously this had to be

emsdk install sdk-releases-upstream-HASH

The only thing preventing using just the hash was that there was no
default for the backend, so defaulting to upstream fixes this. And then
we can do

emsdk install HASH
---
 emsdk.py     | 2 ++
 test/test.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index bf4986a884..22412e2a88 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2767,6 +2767,8 @@ def expand_sdk_name(name, activating):
           backend = 'fastcomp'
       return 'sdk-releases-%s-%s-64bit' % (backend, release_hash)
     elif len(version) == 40:
+      if backend is None:
+        backend = 'upstream'
       global extra_release_tag
       extra_release_tag = version
       return 'sdk-releases-%s-%s-64bit' % (backend, version)
diff --git a/test/test.py b/test/test.py
index bd21154bc8..8d2666991c 100755
--- a/test/test.py
+++ b/test/test.py
@@ -259,10 +259,10 @@ def test_update_no_git(self):
 
   def test_install_arbitrary(self):
     # Test that its possible to install arbrary emscripten-releases SDKs
-    run_emsdk('install sdk-releases-upstream-5c776e6a91c0cb8edafca16a652ee1ee48f4f6d2')
+    run_emsdk('install 5c776e6a91c0cb8edafca16a652ee1ee48f4f6d2')
 
     # Check that its not re-downloaded
-    checked_call_with_output(emsdk + ' install sdk-releases-upstream-5c776e6a91c0cb8edafca16a652ee1ee48f4f6d2', expected='Skipped', unexpected='Downloading:')
+    checked_call_with_output(emsdk + ' install 5c776e6a91c0cb8edafca16a652ee1ee48f4f6d2', expected='Skipped', unexpected='Downloading:')
 
 
 if __name__ == '__main__':

From c1589b55641787d55d53e883852035beea9aec3f Mon Sep 17 00:00:00 2001
From: Tim Talashok <t.talashok@gmail.com>
Date: Thu, 25 Mar 2021 00:50:44 +0100
Subject: [PATCH 146/161] Use emsdk as external bazel dependency (#766)

* Makes provided bazel rules look up @emsdk workspace instead of local workspace
* Uses system-specific emscripten binaries instead of defaulting to linux
* Provides macros for loading emsdk dependencies (nodejs and emscripten binaries)
* Unhardcodes paths in bazel rules and .sh wrappers
* `update_bazel_workspace.sh` now updates `revisions.bzl`
* `emscripten_deps()` can be fed with specific emscripten version
* Adds external usage test

Addresses #650 and #696
---
 .circleci/config.yml                          | 24 +++++-
 bazel/BUILD                                   | 44 ++++++++++
 bazel/WORKSPACE                               | 28 ++-----
 bazel/deps.bzl                                | 11 +++
 bazel/emscripten_deps.bzl                     | 76 ++++++++++++++++++
 bazel/emscripten_toolchain/BUILD.bazel        | 11 +--
 bazel/emscripten_toolchain/crosstool.bzl      | 80 +++++++++++--------
 bazel/emscripten_toolchain/emar.sh            |  2 +-
 bazel/emscripten_toolchain/emcc.sh            |  4 +-
 bazel/emscripten_toolchain/emcc_link.sh       |  4 +-
 bazel/emscripten_toolchain/emscripten_config  |  4 +-
 bazel/emscripten_toolchain/env.sh             |  4 +-
 bazel/emscripten_toolchain/wasm_cc_binary.bzl |  6 +-
 bazel/emscripten_toolchain/wasm_rules.bzl     |  2 +-
 bazel/revisions.bzl                           | 23 ++++++
 bazel/test_external/BUILD                     | 12 +++
 bazel/test_external/WORKSPACE                 | 10 +++
 bazel/test_external/hello-world.cc            |  6 ++
 scripts/update_bazel_workspace.sh             | 49 +++++++-----
 test/test_bazel.sh                            |  7 +-
 test/test_bazel_mac.sh                        | 28 +++++++
 21 files changed, 334 insertions(+), 101 deletions(-)
 create mode 100644 bazel/BUILD
 create mode 100644 bazel/deps.bzl
 create mode 100644 bazel/emscripten_deps.bzl
 create mode 100644 bazel/revisions.bzl
 create mode 100644 bazel/test_external/BUILD
 create mode 100644 bazel/test_external/WORKSPACE
 create mode 100644 bazel/test_external/hello-world.cc
 create mode 100755 test/test_bazel_mac.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 20288af0d6..6ec789d231 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -166,7 +166,7 @@ jobs:
             docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
             make -C ./docker version=${CIRCLE_TAG} alias=latest push
 
-  test-bazel:
+  test-bazel-linux:
     executor: bionic
     steps:
       - checkout
@@ -186,6 +186,21 @@ jobs:
             apt-get install -q -y bazel
       - run: test/test_bazel.sh
 
+  test-bazel-mac:
+    macos:
+      xcode: "12.2.0"
+    environment:
+      EMSDK_NOTTY: "1"
+      HOMEBREW_NO_AUTO_UPDATE: "1"
+    steps:
+      - checkout
+      - run: brew install grep
+      - run:
+          name: install bazel
+          command: |
+            brew install bazel
+      - run: test/test_bazel_mac.sh
+
 workflows:
   flake8:
     jobs:
@@ -208,6 +223,9 @@ workflows:
               ignore: /.*/
             tags:
               only: /.*/
-  test-bazel:
+  test-bazel-linux:
+    jobs:
+      - test-bazel-linux
+  test-bazel-mac:
     jobs:
-      - test-bazel
+      - test-bazel-mac
diff --git a/bazel/BUILD b/bazel/BUILD
new file mode 100644
index 0000000000..9aa46d9379
--- /dev/null
+++ b/bazel/BUILD
@@ -0,0 +1,44 @@
+package(default_visibility = ['//visibility:public'])
+
+config_setting(
+    name = "linux",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+    ],
+)
+
+config_setting(
+    name = "macos",
+    constraint_values = [
+        "@platforms//os:macos",
+        "@platforms//cpu:x86_64",
+    ],
+)
+
+config_setting(
+    name = "windows",
+    constraint_values = [
+        "@platforms//os:windows",
+        "@platforms//cpu:x86_64",
+    ],
+)
+
+alias(
+    name = "binaries",
+    actual = select({
+        ":linux": "@emscripten_bin_linux//:all",
+        ":macos": "@emscripten_bin_mac//:all",
+        ":windows": "@emscripten_bin_win//:all",
+    }),
+)
+
+alias(
+    name = "node_modules",
+    actual = select({
+        ":linux": "@emscripten_npm_linux//:node_modules",
+        ":macos": "@emscripten_npm_mac//:node_modules",
+        ":windows": "@emscripten_npm_win//:node_modules",
+    }),
+)
+
diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE
index d2e8629291..22311ff4a0 100644
--- a/bazel/WORKSPACE
+++ b/bazel/WORKSPACE
@@ -1,25 +1,7 @@
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+workspace(name = "emsdk")
 
-http_archive(
-    name = "build_bazel_rules_nodejs",
-    sha256 = "0f2de53628e848c1691e5729b515022f5a77369c76a09fbe55611e12731c90e3",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.0.1/rules_nodejs-2.0.1.tar.gz"],
-)
+load(":deps.bzl", "deps")
+deps()
 
-load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
-
-# emscripten 2.0.15
-http_archive(
-    name = "emscripten",
-    sha256 = "7ff49fc63adf29970f6e7af1df445d7f554bdbbb2606db1cb5d3567ce69df1db",
-    strip_prefix = "install",
-    url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/89202930a98fe7f9ed59b574469a9471b0bda7dd/wasm-binaries.tbz2",
-    build_file = "//emscripten_toolchain:emscripten.BUILD",
-    type = "tar.bz2",
-)
-
-npm_install(
-    name = "npm",
-    package_json = "@emscripten//:emscripten/package.json",
-    package_lock_json = "@emscripten//:emscripten/package-lock.json",
-)
+load(":emscripten_deps.bzl", "emscripten_deps")
+emscripten_deps()
diff --git a/bazel/deps.bzl b/bazel/deps.bzl
new file mode 100644
index 0000000000..0b37e1fdb8
--- /dev/null
+++ b/bazel/deps.bzl
@@ -0,0 +1,11 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+def deps():
+    excludes = native.existing_rules().keys()
+
+    if "build_bazel_rules_nodejs" not in excludes:
+        http_archive(
+            name = "build_bazel_rules_nodejs",
+            sha256 = "0f2de53628e848c1691e5729b515022f5a77369c76a09fbe55611e12731c90e3",
+            urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.0.1/rules_nodejs-2.0.1.tar.gz"],
+        )
diff --git a/bazel/emscripten_deps.bzl b/bazel/emscripten_deps.bzl
new file mode 100644
index 0000000000..e6a30beea0
--- /dev/null
+++ b/bazel/emscripten_deps.bzl
@@ -0,0 +1,76 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
+load(":revisions.bzl", "EMSCRIPTEN_TAGS")
+
+def _parse_version(v):
+  return [int(u) for u in v.split(".")]
+
+def emscripten_deps(emscripten_version = "latest"):
+    version = emscripten_version
+
+    if version == "latest":
+        version = reversed(sorted(EMSCRIPTEN_TAGS.keys(), key=_parse_version))[0]
+
+    if version not in EMSCRIPTEN_TAGS.keys():
+        error_msg = "Emscripten version {} not found.".format(version)
+        error_msg += " Look at @emsdk//:revisions.bzl for the list "
+        error_msg += "of currently supported versions."
+        fail(error_msg)
+
+    revision = EMSCRIPTEN_TAGS[version]
+
+    emscripten_url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/{}/{}/wasm-binaries.tbz2"
+
+    # This could potentially backfire for projects with multiple emscripten
+    # dependencies that use different emscripten versions
+    excludes = native.existing_rules().keys()
+    if "emscripten_bin_linux" not in excludes:
+        http_archive(
+            name = "emscripten_bin_linux",
+            strip_prefix = "install",
+            url = emscripten_url.format("linux", revision.hash),
+            sha256 = revision.sha_linux,
+            build_file = "@emsdk//emscripten_toolchain:emscripten.BUILD",
+            type = "tar.bz2",
+        )
+
+    if "emscripten_bin_mac" not in excludes:
+        http_archive(
+            name = "emscripten_bin_mac",
+            strip_prefix = "install",
+            url = emscripten_url.format("mac", revision.hash),
+            sha256 = revision.sha_mac,
+            build_file = "@emsdk//emscripten_toolchain:emscripten.BUILD",
+            type = "tar.bz2",
+        )
+
+    if "emscripten_bin_win" not in excludes:
+        http_archive(
+            name = "emscripten_bin_win",
+            strip_prefix = "install",
+            url = emscripten_url.format("win", revision.hash),
+            sha256 = revision.sha_win,
+            build_file = "@emsdk//emscripten_toolchain:emscripten.BUILD",
+            type = "tar.bz2",
+        )
+
+    if "emscripten_npm_linux" not in excludes:
+        npm_install(
+            name = "emscripten_npm_linux",
+            package_json = "@emscripten_bin_linux//:emscripten/package.json",
+            package_lock_json = "@emscripten_bin_linux//:emscripten/package-lock.json",
+        )
+
+    if "emscripten_npm_mac" not in excludes:
+        npm_install(
+            name = "emscripten_npm_mac",
+            package_json = "@emscripten_bin_mac//:emscripten/package.json",
+            package_lock_json = "@emscripten_bin_mac//:emscripten/package-lock.json",
+        )
+
+    if "emscripten_npm_win" not in excludes:
+        npm_install(
+            name = "emscripten_npm_win",
+            package_json = "@emscripten_bin_win//:emscripten/package.json",
+            package_lock_json = "@emscripten_bin_win//:emscripten/package-lock.json",
+        )
diff --git a/bazel/emscripten_toolchain/BUILD.bazel b/bazel/emscripten_toolchain/BUILD.bazel
index 89fc320c71..488da5a027 100644
--- a/bazel/emscripten_toolchain/BUILD.bazel
+++ b/bazel/emscripten_toolchain/BUILD.bazel
@@ -9,9 +9,9 @@ filegroup(
         "emcc.sh",
         "emscripten_config",
         "env.sh",
-        "@emscripten//:all",
         "@nodejs//:node_files",
-        "@npm//:node_modules",
+        "@emsdk//:binaries",
+        "@emsdk//:node_modules",
     ],
 )
 
@@ -26,7 +26,7 @@ filegroup(
         "emcc_link.sh",
         "link_wrapper.py",
         ":common-script-includes",
-        "@emscripten//:all",
+        "@emsdk//:binaries",
         "@nodejs//:node_files",
     ],
 )
@@ -36,7 +36,7 @@ filegroup(
     srcs = [
         ":compile-emscripten",
         ":link-emscripten",
-        "@emscripten//:all",
+        "@emsdk//:binaries",
         "@nodejs//:node_files",
     ],
 )
@@ -49,7 +49,8 @@ cc_library(name = "malloc")
 emscripten_cc_toolchain_config_rule(
     name = "wasm",
     cpu = "wasm",
-    emscripten_version = "emscripten",
+    em_config = "emscripten_config",
+    emscripten_binaries = "@emsdk//:binaries",
 )
 
 cc_toolchain(
diff --git a/bazel/emscripten_toolchain/crosstool.bzl b/bazel/emscripten_toolchain/crosstool.bzl
index 10c15cb1f3..0672ef7597 100644
--- a/bazel/emscripten_toolchain/crosstool.bzl
+++ b/bazel/emscripten_toolchain/crosstool.bzl
@@ -69,9 +69,10 @@ def _impl(ctx):
     abi_libc_version = "default"
 
     cc_target_os = "emscripten"
-    emscripten_version = ctx.attr.emscripten_version
 
-    builtin_sysroot = "external/emscripten/emscripten/cache/sysroot"
+    emscripten_dir = ctx.attr.emscripten_binaries.label.workspace_root
+
+    builtin_sysroot = emscripten_dir + "/emscripten/cache/sysroot"
 
     ################################################################
     # Tools
@@ -909,7 +910,7 @@ def _impl(ctx):
                 "-iwithsysroot" + "/include/c++/v1",
                 "-iwithsysroot" + "/include/compat",
                 "-iwithsysroot" + "/include",
-                "-isystem", "external/emscripten/lib/clang/13.0.0/include",
+                "-isystem", emscripten_dir + "/lib/clang/13.0.0/include",
             ],
         ),
         # Inputs and outputs
@@ -1016,6 +1017,22 @@ def _impl(ctx):
     ]
 
     crosstool_default_env_sets = [
+        # Globals
+        env_set(
+            actions = all_compile_actions +
+                      all_link_actions +
+                      [ACTION_NAMES.cpp_link_static_library],
+            env_entries = [
+                env_entry(
+                    key = "EM_BIN_PATH",
+                    value = emscripten_dir,
+                ),
+                env_entry(
+                    key = "EM_CONFIG_PATH",
+                    value = ctx.file.em_config.path,
+                ),
+            ],
+        ),
         # Use llvm backend.  Off by default, enabled via --features=llvm_backend
         env_set(
             actions = all_compile_actions +
@@ -1052,49 +1069,42 @@ def _impl(ctx):
     features.append(crosstool_default_flags_feature)
 
     cxx_builtin_include_directories = [
-        "external/emscripten/emscripten/cache/sysroot/include/c++/v1",
-        "external/emscripten/emscripten/cache/sysroot/include/compat",
-        "external/emscripten/emscripten/cache/sysroot/include",
-        "external/emscripten/lib/clang/13.0.0/include",
+        emscripten_dir + "/emscripten/cache/sysroot/include/c++/v1",
+        emscripten_dir + "/emscripten/cache/sysroot/include/compat",
+        emscripten_dir + "/emscripten/cache/sysroot/include",
+        emscripten_dir + "/lib/clang/13.0.0/include",
     ]
 
     artifact_name_patterns = []
 
     make_variables = []
 
-    out = ctx.actions.declare_file(ctx.label.name)
-    ctx.actions.write(out, "Fake executable")
-    return [
-        cc_common.create_cc_toolchain_config_info(
-            ctx = ctx,
-            features = features,
-            action_configs = action_configs,
-            artifact_name_patterns = artifact_name_patterns,
-            cxx_builtin_include_directories = cxx_builtin_include_directories,
-            toolchain_identifier = toolchain_identifier,
-            host_system_name = host_system_name,
-            target_system_name = target_system_name,
-            target_cpu = target_cpu,
-            target_libc = target_libc,
-            compiler = compiler,
-            abi_version = abi_version,
-            abi_libc_version = abi_libc_version,
-            tool_paths = tool_paths,
-            make_variables = make_variables,
-            builtin_sysroot = builtin_sysroot,
-            cc_target_os = cc_target_os,
-        ),
-        DefaultInfo(
-            executable = out,
-        ),
-    ]
+    return cc_common.create_cc_toolchain_config_info(
+        ctx = ctx,
+        features = features,
+        action_configs = action_configs,
+        artifact_name_patterns = artifact_name_patterns,
+        cxx_builtin_include_directories = cxx_builtin_include_directories,
+        toolchain_identifier = toolchain_identifier,
+        host_system_name = host_system_name,
+        target_system_name = target_system_name,
+        target_cpu = target_cpu,
+        target_libc = target_libc,
+        compiler = compiler,
+        abi_version = abi_version,
+        abi_libc_version = abi_libc_version,
+        tool_paths = tool_paths,
+        make_variables = make_variables,
+        builtin_sysroot = builtin_sysroot,
+        cc_target_os = cc_target_os,
+    )
 
 emscripten_cc_toolchain_config_rule = rule(
     implementation = _impl,
     attrs = {
         "cpu": attr.string(mandatory = True, values = ["asmjs", "wasm"]),
-        "emscripten_version": attr.string(mandatory = True),
+        "em_config": attr.label(mandatory = True, allow_single_file=True),
+        "emscripten_binaries": attr.label(mandatory = True),
     },
     provides = [CcToolchainConfigInfo],
-    executable = True,
 )
diff --git a/bazel/emscripten_toolchain/emar.sh b/bazel/emscripten_toolchain/emar.sh
index 965442e34c..e4279f16a1 100755
--- a/bazel/emscripten_toolchain/emar.sh
+++ b/bazel/emscripten_toolchain/emar.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-source emscripten_toolchain/env.sh
+source external/emsdk/emscripten_toolchain/env.sh
 
 exec python3 $EMSCRIPTEN/emar.py "$@"
diff --git a/bazel/emscripten_toolchain/emcc.sh b/bazel/emscripten_toolchain/emcc.sh
index 66d00b6c9a..7f3699be1d 100755
--- a/bazel/emscripten_toolchain/emcc.sh
+++ b/bazel/emscripten_toolchain/emcc.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-source emscripten_toolchain/env.sh
+source external/emsdk/emscripten_toolchain/env.sh
 
-exec python3 external/emscripten/emscripten/emcc.py "$@"
+exec python3 $EMSCRIPTEN/emcc.py "$@"
diff --git a/bazel/emscripten_toolchain/emcc_link.sh b/bazel/emscripten_toolchain/emcc_link.sh
index 9d0f8e208b..24d806d029 100755
--- a/bazel/emscripten_toolchain/emcc_link.sh
+++ b/bazel/emscripten_toolchain/emcc_link.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-source emscripten_toolchain/env.sh
+source external/emsdk/emscripten_toolchain/env.sh
 
-exec python3 emscripten_toolchain/link_wrapper.py "$@"
+exec python3 external/emsdk/emscripten_toolchain/link_wrapper.py "$@"
diff --git a/bazel/emscripten_toolchain/emscripten_config b/bazel/emscripten_toolchain/emscripten_config
index b7948aca41..d1275ff978 100644
--- a/bazel/emscripten_toolchain/emscripten_config
+++ b/bazel/emscripten_toolchain/emscripten_config
@@ -3,8 +3,8 @@ import platform
 
 ROOT_DIR = os.environ["ROOT_DIR"]
 EMSCRIPTEN_ROOT = os.environ["EMSCRIPTEN"]
-LLVM_ROOT = ROOT_DIR + "/external/emscripten/bin"
-BINARYEN_ROOT = ROOT_DIR + "/external/emscripten"
+BINARYEN_ROOT = ROOT_DIR + "/" + os.environ["EM_BIN_PATH"]
+LLVM_ROOT = BINARYEN_ROOT + "/bin"
 FROZEN_CACHE = True
 
 system = platform.system()
diff --git a/bazel/emscripten_toolchain/env.sh b/bazel/emscripten_toolchain/env.sh
index dfb4ddc29d..d66a3a1fde 100755
--- a/bazel/emscripten_toolchain/env.sh
+++ b/bazel/emscripten_toolchain/env.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 export ROOT_DIR=`(pwd -P)`
-export EMSCRIPTEN=${ROOT_DIR}/external/emscripten/emscripten
-export EM_CONFIG=${ROOT_DIR}/emscripten_toolchain/emscripten_config
+export EMSCRIPTEN=$ROOT_DIR/$EM_BIN_PATH/emscripten
+export EM_CONFIG=$ROOT_DIR/$EM_CONFIG_PATH
diff --git a/bazel/emscripten_toolchain/wasm_cc_binary.bzl b/bazel/emscripten_toolchain/wasm_cc_binary.bzl
index 9128b7a6ab..9d6804117b 100644
--- a/bazel/emscripten_toolchain/wasm_cc_binary.bzl
+++ b/bazel/emscripten_toolchain/wasm_cc_binary.bzl
@@ -27,13 +27,13 @@ def _wasm_transition_impl(settings, attr):
 
     return {
         "//command_line_option:compiler": "emscripten",
-        "//command_line_option:crosstool_top": "//emscripten_toolchain:everything",
+        "//command_line_option:crosstool_top": "@emsdk//emscripten_toolchain:everything",
         "//command_line_option:cpu": "wasm",
         "//command_line_option:features": features,
         "//command_line_option:dynamic_mode": "off",
         "//command_line_option:linkopt": linkopts,
         "//command_line_option:platforms": [],
-        "//command_line_option:custom_malloc": "//emscripten_toolchain:malloc",
+        "//command_line_option:custom_malloc": "@emsdk//emscripten_toolchain:malloc",
     }
 
 _wasm_transition = transition(
@@ -145,7 +145,7 @@ wasm_cc_binary = rule(
             executable = True,
             allow_files = True,
             cfg = "exec",
-            default = Label("//emscripten_toolchain:wasm_binary"),
+            default = Label("@emsdk//emscripten_toolchain:wasm_binary"),
         ),
     },
     outputs = _wasm_binary_outputs,
diff --git a/bazel/emscripten_toolchain/wasm_rules.bzl b/bazel/emscripten_toolchain/wasm_rules.bzl
index 1c1c409ed5..f8dce22eec 100644
--- a/bazel/emscripten_toolchain/wasm_rules.bzl
+++ b/bazel/emscripten_toolchain/wasm_rules.bzl
@@ -1,6 +1,6 @@
 """Rules related to C++ and WebAssembly.
 """
 
-load("//emscripten_toolchain:wasm_cc_binary.bzl", _wasm_cc_binary = "wasm_cc_binary")
+load(":wasm_cc_binary.bzl", _wasm_cc_binary = "wasm_cc_binary")
 
 wasm_cc_binary = _wasm_cc_binary
diff --git a/bazel/revisions.bzl b/bazel/revisions.bzl
new file mode 100644
index 0000000000..7688dd572e
--- /dev/null
+++ b/bazel/revisions.bzl
@@ -0,0 +1,23 @@
+# This file is automatically updated by emsdk/scripts/update_bazel_workspace.sh
+# DO NOT MODIFY
+
+EMSCRIPTEN_TAGS = {
+   "2.0.15": struct(
+        hash = "89202930a98fe7f9ed59b574469a9471b0bda7dd",
+        sha_linux = "7ff49fc63adf29970f6e7af1df445d7f554bdbbb2606db1cb5d3567ce69df1db",
+        sha_mac = "e35cced1514ad0da40584f8dd6f76aabf847ce0fa82c6dc8dd9442fb74ed6d0d",
+        sha_win = "31d5f8107c87833cea57edc57613bba4b36b16152772f744c5ad204594b4e666",
+    ),
+   "2.0.14": struct(
+        hash = "fc5562126762ab26c4757147a3b4c24e85a7289e",
+        sha_linux = "e466cd47ddd4bf0acd645412fdf08eda6d232484e48e5a2643e08062a7a4cf56",
+        sha_mac = "1c554c08459b7025638ca4eddba0d35babe8c26b202a70a74e9442d577896211",
+        sha_win = "428bc6094671937af96f26d803871fc5cd83d4d2b1c1df45fa6873a9bc5cac51",
+    ),
+   "2.0.13": struct(
+        hash = "ce0e4a4d1cab395ee5082a60ebb4f3891a94b256",
+        sha_linux = "8986ed886e111c661099c5147126b8a379a4040aab6a1f572fe01f0f9b99a343",
+        sha_mac = "88c91332c8c76fed14ebf0edc9a08f586012f54f04ad61e5b1b6d02bf96bdeab",
+        sha_win = "9fb3b945b7bd56e34d17ec04de4cce475f26c49d161aee9d9c0b8b1434591f88",
+    ),
+}
diff --git a/bazel/test_external/BUILD b/bazel/test_external/BUILD
new file mode 100644
index 0000000000..73568cf388
--- /dev/null
+++ b/bazel/test_external/BUILD
@@ -0,0 +1,12 @@
+load("@emsdk//emscripten_toolchain:wasm_rules.bzl", "wasm_cc_binary")
+
+cc_binary(
+    name = "hello-world",
+    srcs = ["hello-world.cc"],
+)
+
+wasm_cc_binary(
+    name = "hello-world-wasm",
+    cc_target = ":hello-world",
+)
+
diff --git a/bazel/test_external/WORKSPACE b/bazel/test_external/WORKSPACE
new file mode 100644
index 0000000000..f0a446c24e
--- /dev/null
+++ b/bazel/test_external/WORKSPACE
@@ -0,0 +1,10 @@
+local_repository(
+    name = "emsdk",
+    path = "..",
+)
+
+load("@emsdk//:deps.bzl", "deps")
+deps()
+
+load("@emsdk//:emscripten_deps.bzl", "emscripten_deps")
+emscripten_deps()
diff --git a/bazel/test_external/hello-world.cc b/bazel/test_external/hello-world.cc
new file mode 100644
index 0000000000..ee72c53171
--- /dev/null
+++ b/bazel/test_external/hello-world.cc
@@ -0,0 +1,6 @@
+#include <iostream>
+
+int main(int argc, char** argv) {
+  std::cout << "hello world!" << std::endl;
+  return 0;
+}
diff --git a/scripts/update_bazel_workspace.sh b/scripts/update_bazel_workspace.sh
index fb58f046ad..b9b7bd278a 100755
--- a/scripts/update_bazel_workspace.sh
+++ b/scripts/update_bazel_workspace.sh
@@ -33,31 +33,40 @@ if [[ $ERR = 1 ]]; then
   exit 1
 fi
 
-URL1=https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/
+URL1=https://storage.googleapis.com/webassembly/emscripten-releases-builds/
 URL2=/wasm-binaries.tbz2
 
+# Get commit hash for $1 version
+get_hash () {
+  echo $(grep "$1" emscripten-releases-tags.txt | grep -v latest | cut -f4 -d\")
+}
+
+# Get sha256 for $1 os $2 hash
+get_sha () {
+  echo $(curl "${URL1}$1/$2${URL2}" 2>/dev/null | sha256sum | awk '{print $1}')
+}
+
+# Assemble dictionary line
+revisions_item () {
+  hash=$(get_hash $1)
+  echo \
+      "\   \"$1\": struct(\n" \
+      "\       hash = \"$(get_hash ${hash})\",\n" \
+      "\       sha_linux = \"$(get_sha linux ${hash})\",\n" \
+      "\       sha_mac = \"$(get_sha mac ${hash})\",\n" \
+      "\       sha_win = \"$(get_sha win ${hash})\",\n" \
+      "\   ),"
+}
+
+append_revision () {
+  sed -i "5 i $(revisions_item $1)" bazel/revisions.bzl
+}
+
 # Get the latest version number from emscripten-releases-tag.txt.
 VER=$(grep -oP '(?<=latest\": \")([\d\.]+)(?=\")' \
         emscripten-releases-tags.txt \
       | sed --expression "s/\./\\\./g")
-# Based on the latest version number, get the commit hash for that version.
-HASH=$(grep "${VER}" emscripten-releases-tags.txt \
-      | grep -v latest \
-      | cut -f4 -d\")
-# Download and compute the sha256sum for the archive with the prebuilts.
-SHA=$(curl "${URL1}${HASH}${URL2}" 2>/dev/null \
-      | sha256sum \
-      | awk '{print $1}')
-# Get the line number on which the sha256 sum lives for emscripten.
-# This will always be one line after the name of the rule.
-SHALINE=$(($(grep -n 'name = "emscripten"' bazel/WORKSPACE \
-      | sed 's/^\([[:digit:]]*\).*$/\1/')+1))
-
-# Insert the new commit hash into the url.
-sed -i "s!\(${URL1}\)\([[:alnum:]]*\)\(${URL2}\)!\1${HASH}\3!" bazel/WORKSPACE
-# Insert the new version number.
-sed -i "s!\(# emscripten \)\(.*\)!\1${VER}!" bazel/WORKSPACE
-# Insert the new sha256 sum.
-sed -i "${SHALINE}s!\"[[:alnum:]]*\"!\"${SHA}\"!" bazel/WORKSPACE
+
+append_revision ${VER}
 
 echo "Done!"
diff --git a/test/test_bazel.sh b/test/test_bazel.sh
index 6a2c98db52..6ae69f9ba8 100755
--- a/test/test_bazel.sh
+++ b/test/test_bazel.sh
@@ -17,9 +17,12 @@ HASH=$(grep "${VER}" emscripten-releases-tags.txt \
 FAILMSG="!!! scripts/update_bazel_toolchain.sh needs to be run !!!"
 
 # Ensure the WORKSPACE file is up to date with the latest version.
-grep ${VER} bazel/WORKSPACE || (echo ${FAILMSG} && false)
-grep ${HASH} bazel/WORKSPACE || (echo ${FAILMSG} && false)
+grep ${VER} bazel/revisions.bzl || (echo ${FAILMSG} && false)
+grep ${HASH} bazel/revisions.bzl || (echo ${FAILMSG} && false)
 
 cd bazel
 bazel build //hello-world:hello-world-wasm
 bazel build //hello-world:hello-world-wasm-simd
+
+cd test_external
+bazel build //:hello-world-wasm
diff --git a/test/test_bazel_mac.sh b/test/test_bazel_mac.sh
new file mode 100755
index 0000000000..851ec5fdde
--- /dev/null
+++ b/test/test_bazel_mac.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+echo "test bazel"
+
+set -x
+set -e
+
+# Get the latest version number from emscripten-releases-tag.txt.
+VER=$(ggrep -oP '(?<=latest\": \")([\d\.]+)(?=\")' \
+        emscripten-releases-tags.txt \
+      | sed "s/\./\\\./g")
+# Based on the latest version number, get the commit hash for that version.
+HASH=$(grep "${VER}" emscripten-releases-tags.txt \
+      | grep -v latest \
+      | cut -f4 -d\")
+
+FAILMSG="!!! scripts/update_bazel_toolchain.sh needs to be run !!!"
+
+# Ensure the WORKSPACE file is up to date with the latest version.
+grep ${VER} bazel/revisions.bzl || (echo ${FAILMSG} && false)
+grep ${HASH} bazel/revisions.bzl || (echo ${FAILMSG} && false)
+
+cd bazel
+bazel build //hello-world:hello-world-wasm
+bazel build //hello-world:hello-world-wasm-simd
+
+cd test_external
+bazel build //:hello-world-wasm

From 459f7c14f651bebc6025c4f52c716e8c161e7d6e Mon Sep 17 00:00:00 2001
From: Tim Talashok <t.talashok@gmail.com>
Date: Thu, 25 Mar 2021 18:00:30 +0100
Subject: [PATCH 147/161] Update bazel readme (#774)

* Update bazel/README.md

* Add deps instantiation to readme

* Add bazelrc explanations to readme

* Note the preferred way of using bazel emsdk
---
 bazel/README.md | 56 ++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/bazel/README.md b/bazel/README.md
index 17e9264f66..dc849fd27a 100644
--- a/bazel/README.md
+++ b/bazel/README.md
@@ -2,40 +2,34 @@
 
 ## Setup Instructions
 
-1. Merge the `WORKSPACE` file in with your own at the root of your bazel
-directory structure. If you don't have one, simply copy the file.
-2. Merge the `bazelrc` file in with your `.bazelrc` file at the root of your
-bazel directory structure. If you don't have one, simply copy the file and
-rename it to `.bazelrc`. (Note the `.`)
-3. Copy the `emscripten_toolchain` folder along with its contents to the root of
-your bazel directory.
-
-Your directory structure should look like this:
+In `WORKSPACE` file, put:
 ```
-bazel_root/
-├── .bazelrc
-├── WORKSPACE
-├── emscripten_toolchain/
-│   ├── BUILD.bazel
-│   ├── builddefs.bzl
-│   ├── crosstool.bzl
-│   ├── emar.sh
-│   ├── emcc.sh
-│   ├── emcc_link.sh
-│   ├── emscripten.BUILD
-│   ├── emscripten_config
-│   ├── env.sh
-│   ├── link_wrapper.py
-│   ├── wasm_binary.py
-│   ├── wasm_cc_binary.bzl
-│   ├── wasm_rules.bzl
-├── your_project_folder/
-│   ├── your_project.file
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+http_archive(
+    name = "emsdk",
+    strip_prefix = "emsdk-c1589b55641787d55d53e883852035beea9aec3f/bazel",
+    url = "https://github.com/emscripten-core/emsdk/archive/c1589b55641787d55d53e883852035beea9aec3f.tar.gz",
+    sha256 = "7a58a9996b113d3e0675df30b5f17e28aa47de2e684a844f05394fe2f6f12e8e",
+)
+
+load("@emsdk//:deps.bzl", emsdk_deps = "deps")
+emsdk_deps()
+
+load("@emsdk//:emscripten_deps.bzl", emsdk_emscripten_deps = "emscripten_deps")
+emsdk_emscripten_deps()
 ```
 
 ## Building
 
 ### Using --config=wasm
+
+Put the following lines into your `.bazelrc`:
+```
+build:wasm --crosstool_top=//emscripten_toolchain:everything
+build:wasm --cpu=wasm
+build:wasm --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
+```
+
 Simply pass `--config=wasm` when building a normal `cc_binary`. The result of
 this build will be a tar archive containing any files produced by emscripten.
 
@@ -44,7 +38,7 @@ First, write a new rule wrapping your `cc_binary`.
 
 ```
 load("@rules_cc//cc:defs.bzl", "cc_binary")
-load("//emscripten_toolchain:wasm_rules.bzl", "wasm_cc_binary")
+load("@emsdk//emscripten_toolchain:wasm_rules.bzl", "wasm_cc_binary")
 
 cc_binary(
     name = "hello-world",
@@ -61,3 +55,7 @@ Now you can run `bazel build :hello-world-wasm`. The result of this build will
 be the individual files produced by emscripten. Note that some of these files
 may be empty. This is because bazel has no concept of optional outputs for
 rules.
+
+`wasm_cc_binary` uses transition to use emscripten toolchain on `cc_target`
+and all of its dependencies, and does not require amending `.bazelrc`. This
+is the preferred way, since it also unpacks the resulting tarball.

From 6162e2e783526e9dab0726634a6583139dda6da1 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 25 Mar 2021 19:00:07 -0700
Subject: [PATCH 148/161] 2.0.16 (#773)

---
 bazel/revisions.bzl          | 6 ++++++
 emscripten-releases-tags.txt | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bazel/revisions.bzl b/bazel/revisions.bzl
index 7688dd572e..318b523a4c 100644
--- a/bazel/revisions.bzl
+++ b/bazel/revisions.bzl
@@ -2,6 +2,12 @@
 # DO NOT MODIFY
 
 EMSCRIPTEN_TAGS = {
+   "2.0.16": struct(
+        hash = "80d9674f2fafa6b9346d735c42d5c52b8cc8aa8e",
+        sha_linux = "e527638b224d9a30dc7e5fa4b9bd2eb2ab76ad306739ba8cacf5a5e333933a2a",
+        sha_mac = "061020eb0e3ee0611dc5a0008ccc7778168a4f838d49ca41c0aad8c52c1a01c9",
+        sha_win = "99364ed0388f928e0594f790662bf3a30c2894b0eff81797e1b64f62128561cb",
+    ),
    "2.0.15": struct(
         hash = "89202930a98fe7f9ed59b574469a9471b0bda7dd",
         sha_linux = "7ff49fc63adf29970f6e7af1df445d7f554bdbbb2606db1cb5d3567ce69df1db",
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 8b327ea71e..06a5c6ad41 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.15",
+  "latest": "2.0.16",
   "releases": {
+    "2.0.16":  "80d9674f2fafa6b9346d735c42d5c52b8cc8aa8e",
     "2.0.15":  "89202930a98fe7f9ed59b574469a9471b0bda7dd",
     "2.0.14":  "fc5562126762ab26c4757147a3b4c24e85a7289e",
     "2.0.13":  "ce0e4a4d1cab395ee5082a60ebb4f3891a94b256",

From 2e7eaf7233144e5e25b1c1338890bbab5d011815 Mon Sep 17 00:00:00 2001
From: "Piotr Paczkowski (trzeci.eu)" <kontakt@trzeci.eu>
Date: Sun, 28 Mar 2021 17:25:23 +0200
Subject: [PATCH 149/161] Correct README.md about building arguments of docker
 image. Fixes #748 (#777)

---
 docker/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index d7c7fc8c42..7b9d301483 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -47,11 +47,11 @@ Teardown of compilation command:
 
 ### Building Dockerfile
 
-This image requires to specify following build arguments:
+This image has following optional arguments
 
-| arg | description |
-| --- | --- |
-| `EMSCRIPTEN_VERSION` | One of released version of Emscripten. For example `1.39.17`<br/> Minimal supported version is **1.39.0**|
+| arg | default value | description |
+| --- | --- | --- |
+| `EMSCRIPTEN_VERSION` | `tot`<br/>(special case, tip-of-tree) | One of released version of Emscripten. For example `2.0.0`<br/> Minimal supported version is **1.39.0** |
 
 **Building**
 

From f03f1dc5796b2d1cb2c5430c01a0823362410bfb Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Sat, 10 Apr 2021 17:41:55 -0700
Subject: [PATCH 150/161] 2.0.17 (#786)

---
 bazel/revisions.bzl          | 6 ++++++
 emscripten-releases-tags.txt | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bazel/revisions.bzl b/bazel/revisions.bzl
index 318b523a4c..a228ee4c95 100644
--- a/bazel/revisions.bzl
+++ b/bazel/revisions.bzl
@@ -2,6 +2,12 @@
 # DO NOT MODIFY
 
 EMSCRIPTEN_TAGS = {
+   "2.0.17": struct(
+        hash = "f5c45e60392b82f603e3a8039c62db294fab02d2",
+        sha_linux = "b40a4874057e4cace600f8ee9787dcbe236e3dc5b2fff5c2ecb0e867e426f99c",
+        sha_mac = "081f61abf7d5ac0ec31aaffc5550013d4093ea4ea39520b7a32b7448d2a6ee70",
+        sha_win = "45d06e597e6a1185a76200bd0481495e7298800a4805045d9cdbcce6311c91b2",
+    ),
    "2.0.16": struct(
         hash = "80d9674f2fafa6b9346d735c42d5c52b8cc8aa8e",
         sha_linux = "e527638b224d9a30dc7e5fa4b9bd2eb2ab76ad306739ba8cacf5a5e333933a2a",
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 06a5c6ad41..2308ae8277 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,6 +1,7 @@
 {
-  "latest": "2.0.16",
+  "latest": "2.0.17",
   "releases": {
+    "2.0.17":  "f5c45e60392b82f603e3a8039c62db294fab02d2",
     "2.0.16":  "80d9674f2fafa6b9346d735c42d5c52b8cc8aa8e",
     "2.0.15":  "89202930a98fe7f9ed59b574469a9471b0bda7dd",
     "2.0.14":  "fc5562126762ab26c4757147a3b4c24e85a7289e",

From bda6a0c5a524ba1128a51585a64ab4789305ba26 Mon Sep 17 00:00:00 2001
From: juj <jujjyl@gmail.com>
Date: Fri, 23 Apr 2021 10:53:02 +0300
Subject: [PATCH 151/161] Remove the use of a custom temp directory. That is a
 bad practice, we should reuse system temp directory instead, that is what it
 is there for. (#791)

---
 emsdk.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 22412e2a88..fc55934aef 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -1604,9 +1604,6 @@ def load_dot_emscripten():
 
 
 def generate_dot_emscripten(active_tools):
-  temp_dir = sdk_path('tmp')
-  mkdir_p(temp_dir)
-
   cfg = 'import os\n'
   cfg += "emsdk_path = os.path.dirname(os.environ.get('EM_CONFIG')).replace('\\\\', '/')\n"
 
@@ -1627,10 +1624,9 @@ def generate_dot_emscripten(active_tools):
     cfg += name + " = '" + value + "'\n"
 
   cfg += '''\
-TEMP_DIR = '%s'
 COMPILER_ENGINE = NODE_JS
 JS_ENGINES = [NODE_JS]
-''' % temp_dir
+'''
 
   cfg = cfg.replace("'" + emsdk_path(), "emsdk_path + '")
 

From e32410e004245f382ad77d1f5250d2b8cdff9e65 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 23 Apr 2021 10:35:23 -0700
Subject: [PATCH 152/161] Add create_release.py script (#798)

---
 scripts/create_release.py | 59 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100755 scripts/create_release.py

diff --git a/scripts/create_release.py b/scripts/create_release.py
new file mode 100755
index 0000000000..b84a43284f
--- /dev/null
+++ b/scripts/create_release.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+
+import json
+import os
+import subprocess
+import sys
+from collections import OrderedDict
+
+script_dir = os.path.dirname(os.path.abspath(__file__))
+root_dir = os.path.dirname(script_dir)
+sys.path.append(root_dir)
+
+import emsdk  # noqa
+
+
+def version_to_list(version_string):
+  return [int(part) for part in version_string.split('.')]
+
+
+def main(args):
+  if subprocess.check_output(['git', 'status', '--porcelain'], cwd=root_dir).strip():
+    print('tree is not clean')
+    sys.exit(1)
+
+  release_info = emsdk.load_releases_info()
+  new_version = version_to_list(release_info['latest'])
+  new_version[-1] += 1
+  branch_name = 'version_%s' % '_'.join(str(part) for part in new_version)
+
+  # Create a new git branch
+  subprocess.check_call(['git', 'checkout', '-b', branch_name], cwd=root_dir)
+
+  new_version = '.'.join(str(part) for part in new_version)
+  new_hash = emsdk.get_emscripten_releases_tot()
+  print('Creating new release: %s -> %s' % (new_version, new_hash))
+  release_info['releases'][new_version] = new_hash
+  releases = [(k, v) for k, v in release_info['releases'].items()]
+  releases.sort(key=lambda pair: version_to_list(pair[0]))
+
+  release_info['releases'] = OrderedDict(reversed(releases))
+  release_info['latest'] = new_version
+
+  with open(os.path.join(root_dir, 'emscripten-releases-tags.txt'), 'w') as f:
+    f.write(json.dumps(release_info, indent=2))
+    f.write('\n')
+
+  subprocess.check_call(os.path.join(script_dir, 'update_bazel_workspace.sh'), cwd=root_dir)
+
+  # Create auto-generated changes to the new git branch
+  subprocess.check_call(['git', 'add', '-u', '.'], cwd=root_dir)
+  subprocess.check_call(['git', 'commit', '-m', new_version], cwd=root_dir)
+
+  print('New relase created in branch: `%s`' % branch_name)
+
+  return 0
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv[1:]))

From cee96f8054964617d6ca870209483220222601bd Mon Sep 17 00:00:00 2001
From: Derek Schuff <dschuff@chromium.org>
Date: Fri, 23 Apr 2021 18:35:03 -0700
Subject: [PATCH 153/161] 2.0.18 (#799)

---
 bazel/revisions.bzl          |  6 ++++
 emscripten-releases-tags.txt | 64 ++++++++++++++++++------------------
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/bazel/revisions.bzl b/bazel/revisions.bzl
index a228ee4c95..eae75d13d3 100644
--- a/bazel/revisions.bzl
+++ b/bazel/revisions.bzl
@@ -2,6 +2,12 @@
 # DO NOT MODIFY
 
 EMSCRIPTEN_TAGS = {
+   "2.0.18": struct(
+        hash = "c2ac7520fad29a7937ed60ab6a95b08eb374c7ba",
+        sha_linux = "e9f777de592f606b10104b2efe5179a7a8f44e3a9dffa1e3aaf73e05eb8893d7",
+        sha_mac = "86b1dd62e424e3788bf132292a694a25ca9b0875d06f50d0f5d424593697452c",
+        sha_win = "49ce07bda6be070251db44a08fcc05cae21ffdbd7522423a0c79bde635e87e28",
+    ),
    "2.0.17": struct(
         hash = "f5c45e60392b82f603e3a8039c62db294fab02d2",
         sha_linux = "b40a4874057e4cace600f8ee9787dcbe236e3dc5b2fff5c2ecb0e867e426f99c",
diff --git a/emscripten-releases-tags.txt b/emscripten-releases-tags.txt
index 2308ae8277..7865a835b4 100644
--- a/emscripten-releases-tags.txt
+++ b/emscripten-releases-tags.txt
@@ -1,26 +1,27 @@
 {
-  "latest": "2.0.17",
+  "latest": "2.0.18",
   "releases": {
-    "2.0.17":  "f5c45e60392b82f603e3a8039c62db294fab02d2",
-    "2.0.16":  "80d9674f2fafa6b9346d735c42d5c52b8cc8aa8e",
-    "2.0.15":  "89202930a98fe7f9ed59b574469a9471b0bda7dd",
-    "2.0.14":  "fc5562126762ab26c4757147a3b4c24e85a7289e",
-    "2.0.13":  "ce0e4a4d1cab395ee5082a60ebb4f3891a94b256",
-    "2.0.12":  "dcf819a7821f8db0c8f15ac336fea8960ec204f5",
-    "2.0.11":  "4764c5c323a474f7ba28ae991b0c9024fccca43c",
-    "2.0.10":  "37fc7647c754ac9a28ad588c143b82286de0ef71",
-    "2.0.9":   "d8e430f9a9b6e87502f826c39e7684852f59624f",
-    "2.0.8":   "e4ed6c79f4db8b175d9bbe55869b697aba9bcf2a",
-    "2.0.7":   "d7a29d82b320e471203b69d43aaf03b560eedc54",
-    "2.0.6":   "4ba921c8c8fe2e8cae071ca9889d5c27f5debd87",
-    "2.0.5":   "461f0f118d8d8e6cfd84e077f3eb010c17a39032",
-    "2.0.4":   "eefeb3e623af023844ac477d70d1fd8a668f5110",
-    "2.0.3":   "7a7f38ca19da152d4cd6da4776921a0f1e3f3e3f",
-    "2.0.2":   "ede25d889a0abe63360d4c5d420087c8753b8bbe",
-    "2.0.1":   "13e29bd55185e3c12802bc090b4507901856b2ba",
-    "2.0.0":   "5974288502aab433d45f53511e961aaca4079d86",
-    "1.40.1":  "536568644fd67d53778f6111fdd5f64ad3f4c539",
-    "1.40.0":  "edf24e7233e0def312a08cc8dcec63a461155da1",
+    "2.0.18": "c2ac7520fad29a7937ed60ab6a95b08eb374c7ba",
+    "2.0.17": "f5c45e60392b82f603e3a8039c62db294fab02d2",
+    "2.0.16": "80d9674f2fafa6b9346d735c42d5c52b8cc8aa8e",
+    "2.0.15": "89202930a98fe7f9ed59b574469a9471b0bda7dd",
+    "2.0.14": "fc5562126762ab26c4757147a3b4c24e85a7289e",
+    "2.0.13": "ce0e4a4d1cab395ee5082a60ebb4f3891a94b256",
+    "2.0.12": "dcf819a7821f8db0c8f15ac336fea8960ec204f5",
+    "2.0.11": "4764c5c323a474f7ba28ae991b0c9024fccca43c",
+    "2.0.10": "37fc7647c754ac9a28ad588c143b82286de0ef71",
+    "2.0.9": "d8e430f9a9b6e87502f826c39e7684852f59624f",
+    "2.0.8": "e4ed6c79f4db8b175d9bbe55869b697aba9bcf2a",
+    "2.0.7": "d7a29d82b320e471203b69d43aaf03b560eedc54",
+    "2.0.6": "4ba921c8c8fe2e8cae071ca9889d5c27f5debd87",
+    "2.0.5": "461f0f118d8d8e6cfd84e077f3eb010c17a39032",
+    "2.0.4": "eefeb3e623af023844ac477d70d1fd8a668f5110",
+    "2.0.3": "7a7f38ca19da152d4cd6da4776921a0f1e3f3e3f",
+    "2.0.2": "ede25d889a0abe63360d4c5d420087c8753b8bbe",
+    "2.0.1": "13e29bd55185e3c12802bc090b4507901856b2ba",
+    "2.0.0": "5974288502aab433d45f53511e961aaca4079d86",
+    "1.40.1": "536568644fd67d53778f6111fdd5f64ad3f4c539",
+    "1.40.0": "edf24e7233e0def312a08cc8dcec63a461155da1",
     "1.39.20": "e7e39da9c81faecd9ecf44065cee864d76e4e34d",
     "1.39.19": "665121d026cafc46c29b30d6d4c45ed73eedbb7e",
     "1.39.18": "1914a1543f08cd8e41f44c2bb05f7a90d1920275",
@@ -32,16 +33,16 @@
     "1.39.12": "e13b86d4dbd9a986525ef27d4ad8157949b9bc3a",
     "1.39.11": "6584e2d88570ee55914db92a3bad84f99e5bdd82",
     "1.39.10": "65d33d604d3fa0ebe03548378b898fc6608e9cb8",
-    "1.39.9":  "122396dfad60e1b2a83ccefa74a1425a2e05b5cb",
-    "1.39.8":  "9e60f34accb4627d7358223862a7e74291886ab6",
-    "1.39.7":  "9a89fff28cc6f75e17976fce1904b280e4beb25d",
-    "1.39.6":  "967836071d96d9b7894e492382f5fcb96423fc07",
-    "1.39.5":  "b3ddcab6efd749d3ed937fb452ace4e39a825842",
-    "1.39.4":  "8bb7b0bbbca74cc58741416cc955011f22ff5ccb",
-    "1.39.3":  "b024b71038d1291ed7ec23ecd553bf2c0c8d6da6",
-    "1.39.2":  "c630da9163a64e08de3dd948be0a0f7a175d285b",
-    "1.39.1":  "40f3caabcef7b52bdde63d3883462414d7a25bec",
-    "1.39.0":  "d57bfdd6d43181501bbd3fab502d57c9073ceb49",
+    "1.39.9": "122396dfad60e1b2a83ccefa74a1425a2e05b5cb",
+    "1.39.8": "9e60f34accb4627d7358223862a7e74291886ab6",
+    "1.39.7": "9a89fff28cc6f75e17976fce1904b280e4beb25d",
+    "1.39.6": "967836071d96d9b7894e492382f5fcb96423fc07",
+    "1.39.5": "b3ddcab6efd749d3ed937fb452ace4e39a825842",
+    "1.39.4": "8bb7b0bbbca74cc58741416cc955011f22ff5ccb",
+    "1.39.3": "b024b71038d1291ed7ec23ecd553bf2c0c8d6da6",
+    "1.39.2": "c630da9163a64e08de3dd948be0a0f7a175d285b",
+    "1.39.1": "40f3caabcef7b52bdde63d3883462414d7a25bec",
+    "1.39.0": "d57bfdd6d43181501bbd3fab502d57c9073ceb49",
     "1.38.48": "1290d9deb93d67c4649999a8f2c8d9167d38dc04",
     "1.38.47": "bc367c257409d676e71c5511383228b7aabf1689",
     "1.38.46": "c89919d252f7cea00d944bdf3bd630cd3c7e7388",
@@ -60,4 +61,3 @@
     "1.38.33": "3b8cff670e9233a6623563add831647e8689a86b"
   }
 }
-

From 4282d5d44bf8b73b35d9c4a466a89c91e7df37c7 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 26 Apr 2021 06:29:01 -0700
Subject: [PATCH 154/161] Avoid setting `EM_CACHE` unless we really need to
 (#797)

This avoid polluting the global environment which makes
side-by-side installational of different emscripten version
harder.

See https://github.com/emscripten-core/emscripten/pull/13954
---
 emsdk.py                        | 32 ++++++++++++++++++++++++++++----
 test/test.py                    |  6 ------
 test/test_activation.ps1        |  7 -------
 test/test_path_preservation.ps1 |  3 ---
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index fc55934aef..48ac2a9ce3 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2171,6 +2171,14 @@ def find_tot_sdk():
   return 'sdk-releases-upstream-%s-64bit' % (extra_release_tag)
 
 
+def parse_emscripten_version(emscripten_root):
+  version_file = os.path.join(emscripten_root, 'emscripten-version.txt')
+  with open(version_file) as f:
+    version = f.read().strip()
+    version = version.strip('"').split('.')
+    return [int(v) for v in version]
+
+
 # Given a git hash in emscripten-releases, find the emscripten
 # version for it. There may not be one if this is not the hash of
 # a release, in which case we return None.
@@ -2643,10 +2651,26 @@ def get_env_vars_to_add(tools_to_activate, system, user):
   for tool in tools_to_activate:
     config = tool.activated_config()
     if 'EMSCRIPTEN_ROOT' in config:
-      # For older emscripten versions that don't use this default we export
-      # EM_CACHE.
-      em_cache_dir = os.path.join(config['EMSCRIPTEN_ROOT'], 'cache')
-      env_vars_to_add += [('EM_CACHE', em_cache_dir)]
+      # For older emscripten versions that don't use an embedded cache by
+      # default we need to export EM_CACHE.
+      #
+      # Sadly, we can't put this in the config file since those older versions
+      # also didn't read the `CACHE` key from the config file:
+      #
+      # History:
+      # - 'CACHE' config started being honored in 1.39.16
+      #   https://github.com/emscripten-core/emscripten/pull/11091
+      # - Default to embedded cache also started in 1.39.16
+      #   https://github.com/emscripten-core/emscripten/pull/11126
+      #
+      # Since setting EM_CACHE in the environment effects the entire machine
+      # we want to avoid this except when installing these older emscripten
+      # versions that really need it.
+      version = parse_emscripten_version(config['EMSCRIPTEN_ROOT'])
+      if version < [1, 39, 16]:
+        em_cache_dir = os.path.join(config['EMSCRIPTEN_ROOT'], 'cache')
+        env_vars_to_add += [('EM_CACHE', em_cache_dir)]
+
     envs = tool.activated_environment()
     for env in envs:
       key, value = parse_key_value(env)
diff --git a/test/test.py b/test/test.py
index 8d2666991c..2824efc66e 100755
--- a/test/test.py
+++ b/test/test.py
@@ -12,12 +12,6 @@
 
 assert 'EM_CONFIG' in os.environ, "emsdk should be activated before running this script"
 
-# Remove the EM_CACHE environment variable.  It interferes with testing since
-# it would otherwise be fixed for the duration of the script and we expect
-# "emsdk activate" to be able switch between SDKs during the running of this
-# script.
-del os.environ['EM_CACHE']
-
 emconfig = os.environ['EM_CONFIG']
 upstream_emcc = os.path.join('upstream', 'emscripten', 'emcc')
 fastcomp_emcc = os.path.join('fastcomp', 'emscripten', 'emcc')
diff --git a/test/test_activation.ps1 b/test/test_activation.ps1
index 82907bb162..1aa0a97c9b 100644
--- a/test/test_activation.ps1
+++ b/test/test_activation.ps1
@@ -32,7 +32,6 @@ try {
     $EMSDK_NODE = [System.Environment]::GetEnvironmentVariable("EMSDK_NODE", $env_type)
     $EMSDK_PYTHON = [System.Environment]::GetEnvironmentVariable("EMSDK_PYTHON", $env_type)
     $JAVA_HOME = [System.Environment]::GetEnvironmentVariable("JAVA_HOME", $env_type)
-    $EM_CACHE = [System.Environment]::GetEnvironmentVariable("EM_CACHE", $env_type)
     $PATH = [System.Environment]::GetEnvironmentVariable("PATH", $env_type)
 
     if (!$EMSDK) {
@@ -50,9 +49,6 @@ try {
     if (!$EMSDK_PYTHON) {
         throw "EMSDK_PYTHON is not set for the user"
     }
-    if (!$EM_CACHE) {
-        throw "EM_CACHE is not set for the user"
-    }
 
 
     $path_split = $PATH.Split(';')
@@ -91,7 +87,6 @@ finally {
     [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "User")
     [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "User")
     [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "User")
-    [Environment]::SetEnvironmentVariable("EM_CACHE", $null, "User")
 
     try {
         [Environment]::SetEnvironmentVariable("EMSDK", $null, "Machine")
@@ -99,7 +94,6 @@ finally {
         [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Machine")
         [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Machine")
         [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Machine")
-        [Environment]::SetEnvironmentVariable("EM_CACHE", $null, "Machine")
     } catch {}
 
 
@@ -108,7 +102,6 @@ finally {
     [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Process")
     [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Process")
     [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Process")
-    [Environment]::SetEnvironmentVariable("EM_CACHE", $null, "Process")
 
     refreshenv
 }
diff --git a/test/test_path_preservation.ps1 b/test/test_path_preservation.ps1
index 79a42d93bd..b894954564 100644
--- a/test/test_path_preservation.ps1
+++ b/test/test_path_preservation.ps1
@@ -127,7 +127,6 @@ finally {
     [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "User")
     [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "User")
     [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "User")
-    [Environment]::SetEnvironmentVariable("EM_CACHE", $null, "User")
 
     try {
         [Environment]::SetEnvironmentVariable("EMSDK", $null, "Machine")
@@ -135,7 +134,6 @@ finally {
         [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Machine")
         [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Machine")
         [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Machine")
-        [Environment]::SetEnvironmentVariable("EM_CACHE", $null, "Machine")
     } catch {}
 
 
@@ -144,7 +142,6 @@ finally {
     [Environment]::SetEnvironmentVariable("EMSDK_NODE", $null, "Process")
     [Environment]::SetEnvironmentVariable("EMSDK_PYTHON", $null, "Process")
     [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Process")
-    [Environment]::SetEnvironmentVariable("EM_CACHE", $null, "Process")
 
     refreshenv
 

From 16ee884464be3bdd99b496bb6e9f4118324abfd8 Mon Sep 17 00:00:00 2001
From: juj <jujjyl@gmail.com>
Date: Tue, 27 Apr 2021 00:38:00 +0300
Subject: [PATCH 155/161] Fix issues with npm install of
 google-closure-compiler installing all dev packages as well. (#793)

---
 emsdk.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index 48ac2a9ce3..96a47e3880 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -1411,7 +1411,7 @@ def emscripten_npm_install(tool, directory):
     print('Running post-install step: npm install', closure_compiler_native)
     try:
       subprocess.check_output(
-        [npm, 'install', closure_compiler_native],
+        [npm, 'install', '--production', '--no-optional', closure_compiler_native],
         cwd=directory, stderr=subprocess.STDOUT, env=env,
         universal_newlines=True)
     except subprocess.CalledProcessError as e:

From 3510ab2697eff7317d449c7beee2b5acd607304f Mon Sep 17 00:00:00 2001
From: juj <jujjyl@gmail.com>
Date: Thu, 29 Apr 2021 13:32:43 +0300
Subject: [PATCH 156/161] Add option --override-repository (#792)

* Add option --override-repository to allow controlling where git clones happen from.

* Address review
---
 emsdk.py | 74 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 63 insertions(+), 11 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 96a47e3880..0aae94e4f9 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -182,6 +182,27 @@ def emsdk_path():
 else:
   EMSDK_SET_ENV = os.path.join(emsdk_path(), 'emsdk_set_env.bat')
 
+
+# Parses https://github.com/emscripten-core/emscripten/tree/d6aced8 to a pair (https://github.com/emscripten-core/emscripten, d6aced8)
+def parse_github_url_and_refspec(url):
+  if not url:
+    return ('', '')
+
+  if url.endswith(('/tree/', '/tree', '/commit/', '/commit')):
+    raise Exception('Malformed git URL and refspec ' + url + '!')
+
+  if '/tree/' in url:
+    if url.endswith('/'):
+      raise Exception('Malformed git URL and refspec ' + url + '!')
+    return url.split('/tree/')
+  elif '/commit/' in url:
+    if url.endswith('/'):
+      raise Exception('Malformed git URL and refspec ' + url + '!')
+    return url.split('/commit/')
+  else:
+    return (url, 'main')  # Assume the default branch is main in the absence of a refspec
+
+
 ARCHIVE_SUFFIXES = ('zip', '.tar', '.gz', '.xz', '.tbz2', '.bz2')
 
 
@@ -498,11 +519,11 @@ def num_files_in_directory(path):
   return len([name for name in os.listdir(path) if os.path.exists(os.path.join(path, name))])
 
 
-def run(cmd, cwd=None):
+def run(cmd, cwd=None, quiet=False):
   debug_print('run(cmd=' + str(cmd) + ', cwd=' + str(cwd) + ')')
   process = subprocess.Popen(cmd, cwd=cwd, env=os.environ.copy())
   process.communicate()
-  if process.returncode != 0:
+  if process.returncode != 0 and not quiet:
     errlog(str(cmd) + ' failed with error code ' + str(process.returncode) + '!')
   return process.returncode
 
@@ -792,33 +813,37 @@ def git_clone(url, dstpath):
   git_clone_args = []
   if GIT_CLONE_SHALLOW:
     git_clone_args += ['--depth', '1']
+  print('Cloning from ' + url + '...')
   return run([GIT(), 'clone'] + git_clone_args + [url, dstpath]) == 0
 
 
-def git_checkout_and_pull(repo_path, branch):
-  debug_print('git_checkout_and_pull(repo_path=' + repo_path + ', branch=' + branch + ')')
+def git_checkout_and_pull(repo_path, branch_or_tag):
+  debug_print('git_checkout_and_pull(repo_path=' + repo_path + ', branch/tag=' + branch_or_tag + ')')
   ret = run([GIT(), 'fetch', '--quiet', 'origin'], repo_path)
   if ret != 0:
     return False
   try:
-    print("Fetching latest changes to the branch '" + branch + "' for '" + repo_path + "'...")
+    print("Fetching latest changes to the branch/tag '" + branch_or_tag + "' for '" + repo_path + "'...")
     ret = run([GIT(), 'fetch', '--quiet', 'origin'], repo_path)
     if ret != 0:
       return False
-    #  run([GIT, 'checkout', '-b', branch, '--track', 'origin/'+branch], repo_path)
     # this line assumes that the user has not gone and manually messed with the
     # repo and added new remotes to ambiguate the checkout.
-    ret = run([GIT(), 'checkout', '--quiet', branch], repo_path)
+    ret = run([GIT(), 'checkout', '--quiet', branch_or_tag], repo_path)
     if ret != 0:
       return False
-    # this line assumes that the user has not gone and made local changes to the repo
-    ret = run([GIT(), 'merge', '--ff-only', 'origin/' + branch], repo_path)
+    # Test if branch_or_tag is a branch, or if it is a tag that needs to be updated
+    target_is_tag = run([GIT(), 'symbolic-ref', '-q', 'HEAD'], repo_path, quiet=True)
+    if not target_is_tag:
+      # update branch to latest (not needed for tags)
+      # this line assumes that the user has not gone and made local changes to the repo
+      ret = run([GIT(), 'merge', '--ff-only', 'origin/' + branch_or_tag], repo_path)
     if ret != 0:
       return False
   except:
     errlog('git operation failed!')
     return False
-  print("Successfully updated and checked out branch '" + branch + "' on repository '" + repo_path + "'")
+  print("Successfully updated and checked out branch/tag '" + branch_or_tag + "' on repository '" + repo_path + "'")
   print("Current repository version: " + git_repo_version(repo_path))
   return True
 
@@ -1684,7 +1709,9 @@ def __init__(self, data):
       setattr(self, key, value)
 
     # Cache the name ID of this Tool (these are read very often)
-    self.name = self.id + '-' + self.version
+    self.name = self.id
+    if self.version:
+      self.name += '-' + self.version
     if hasattr(self, 'bitness'):
       self.name += '-' + str(self.bitness) + 'bit'
 
@@ -2873,6 +2900,10 @@ def main(args):
                                   in the environment where the build is invoked.
                                   See README.md for details.
 
+           --override-repository: Specifies the git URL to use for a given Tool. E.g.
+                                  --override-repository emscripten-main@https://github.com/<fork>/emscripten/tree/<refspec>
+
+
    emsdk uninstall <tool/sdk>   - Removes the given tool or SDK from disk.''')
 
     if WINDOWS:
@@ -2920,6 +2951,13 @@ def extract_bool_arg(name):
       return True
     return False
 
+  def extract_string_arg(name):
+    for i in range(len(args)):
+      if args[i] == name:
+        value = args[i + 1]
+        del args[i:i + 2]
+        return value
+
   arg_old = extract_bool_arg('--old')
   arg_uses = extract_bool_arg('--uses')
   arg_permanent = extract_bool_arg('--permanent')
@@ -2949,6 +2987,20 @@ def extract_bool_arg(name):
   load_dot_emscripten()
   load_sdk_manifest()
 
+  # Apply any overrides to git branch names to clone from.
+  forked_url = extract_string_arg('--override-repository')
+  while forked_url:
+    tool_name, url_and_refspec = forked_url.split('@')
+    t = find_tool(tool_name)
+    if not t:
+      errlog('Failed to find tool ' + tool_name + '!')
+      return False
+    else:
+      t.url, t.git_branch = parse_github_url_and_refspec(url_and_refspec)
+      debug_print('Reading git repository URL "' + t.url + '" and git branch "' + t.git_branch + '" for Tool "' + tool_name + '".')
+
+    forked_url = extract_string_arg('--override-repository')
+
   # Process global args
   for i in range(len(args)):
     if args[i].startswith('--generator='):

From b4c9194d81c37416dad2bbd2843bb6d37bfdfe4f Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 29 Apr 2021 08:43:20 -0700
Subject: [PATCH 157/161] Unset emsdk-related environment variable from
 inactive tools (#801)

When we deactivate a tool we also want to remove its environment
variables.   One driver for this is that modern sdks don't set
`EM_CACHE` whereas old ones did and we want to make sure that
`EM_CACHE` gets unset when folks upgrade (and then re-set if
they downgrade).  See #797.
---
 emsdk.py     | 76 +++++++++++++++++++++++++++++++---------------------
 test/test.sh | 14 ++++++++++
 2 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index 0aae94e4f9..666e507209 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2711,6 +2711,18 @@ def construct_env(tools_to_activate, system, user):
   return construct_env_with_vars(get_env_vars_to_add(tools_to_activate, system, user))
 
 
+def unset_env(key):
+  if POWERSHELL:
+    return 'Remove-Item env:%s\n' % key
+  if CMD:
+    return 'set %s=\n' % key
+  if CSH:
+    return 'unsetenv %s;\n' % key
+  if BASH:
+    return 'unset %s;\n' % key
+  assert False
+
+
 def construct_env_with_vars(env_vars_to_add):
   env_string = ''
   if env_vars_to_add:
@@ -2718,36 +2730,40 @@ def construct_env_with_vars(env_vars_to_add):
 
     for key, value in env_vars_to_add:
       # Don't set env vars which are already set to the correct value.
-      if key not in os.environ or to_unix_path(os.environ[key]) != to_unix_path(value):
-        errlog(key + ' = ' + value)
-        if POWERSHELL:
-          env_string += '$env:' + key + '="' + value + '"\n'
-        elif CMD:
-          env_string += 'SET ' + key + '=' + value + '\n'
-        elif CSH:
-          env_string += 'setenv ' + key + ' "' + value + '"\n'
-        elif BASH:
-          env_string += 'export ' + key + '="' + value + '"\n'
-        else:
-          assert False
-      if 'EMSDK_PYTHON' in env_vars_to_add:
-        # When using our bundled python we never want the user's
-        # PYTHONHOME or PYTHONPATH
-        # See https://github.com/emscripten-core/emsdk/issues/598
-        if POWERSHELL:
-          env_string += 'Remove-Item env:PYTHONHOME\n'
-          env_string += 'Remove-Item env:PYTHONPATH\n'
-        elif CMD:
-          env_string += 'set PYTHONHOME=\n'
-          env_string += 'set PYTHONPATH=\n'
-        elif CSH:
-          env_string += 'unsetenv PYTHONHOME\n'
-          env_string += 'unsetenv PYTHONPATH\n'
-        elif BASH:
-          env_string += 'unset PYTHONHOME\n'
-          env_string += 'unset PYTHONPATH\n'
-        else:
-          assert False
+      if key in os.environ and to_unix_path(os.environ[key]) == to_unix_path(value):
+        continue
+      errlog(key + ' = ' + value)
+      if POWERSHELL:
+        env_string += '$env:' + key + '="' + value + '"\n'
+      elif CMD:
+        env_string += 'SET ' + key + '=' + value + '\n'
+      elif CSH:
+        env_string += 'setenv ' + key + ' "' + value + '";\n'
+      elif BASH:
+        env_string += 'export ' + key + '="' + value + '";\n'
+      else:
+        assert False
+
+    if 'EMSDK_PYTHON' in env_vars_to_add:
+      # When using our bundled python we never want the user's
+      # PYTHONHOME or PYTHONPATH
+      # See https://github.com/emscripten-core/emsdk/issues/598
+      env_string += unset_env('PYTHONHOME')
+      env_string += unset_env('PYTHONPATH')
+
+  # Remove any environment variables that might have been set by old or
+  # inactive tools/sdks.  For example, we set EM_CACHE for older versions
+  # of the SDK but we want to remove that from the current environment
+  # if no such tool is active.
+  # Ignore certain keys that are inputs to emsdk itself.
+  ignore_keys = set(['EMSDK_POWERSHELL', 'EMSDK_CSH', 'EMSDK_CMD', 'EMSDK_BASH',
+                     'EMSDK_NUM_CORES', 'EMSDK_TTY'])
+  env_keys_to_add = set(pair[0] for pair in env_vars_to_add)
+  for key in os.environ:
+    if key.startswith('EMSDK_') or key.startswith('EM_'):
+      if key not in env_keys_to_add and key not in ignore_keys:
+        errlog('Clearing existing environment variable: %s' % key)
+        env_string += unset_env(key)
 
   return env_string
 
diff --git a/test/test.sh b/test/test.sh
index 473dbb1ff1..9d8171e79b 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -13,9 +13,23 @@ source ./emsdk_env.sh
 which emcc
 emcc -v
 
+# Install an older version of the SDK that requires EM_CACHE to be
+# set in the environment, so that we can test it is later removed
+./emsdk install sdk-fastcomp-3b8cff670e9233a6623563add831647e8689a86b
+./emsdk activate sdk-fastcomp-3b8cff670e9233a6623563add831647e8689a86b
+source ./emsdk_env.sh
+which emcc
+emcc -v
+test -n "$EM_CACHE"
+
+# Install the latest version of the SDK which is the expected precondition
+# of test.py.
 ./emsdk install latest
 ./emsdk activate latest
 source ./emsdk_env.sh --build=Release
+# Test that EM_CACHE was unset
+test -z "$EM_CACHE"
+
 # On mac and windows python3 should be in the path and point to the
 # bundled version.
 which python3

From 894c25b52ae42ca619059e12dbf88c4a3a62f2c5 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 29 Apr 2021 15:48:18 -0700
Subject: [PATCH 158/161] Switch to `HEAD.zip` when downloading archive from
 github. (#806)

This works regardless of the name of the primary branch so that
the code will continue to work if/when we rename `main` to `master`.

See: #805
---
 emsdk.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index 666e507209..113027b9b3 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -44,7 +44,10 @@
 
 emscripten_releases_download_url_template = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/%s/%s/wasm-binaries.%s"
 
-emsdk_zip_download_url = 'https://github.com/emscripten-core/emsdk/archive/master.zip'
+# This was previously `master.zip` but we are transitioning to `main` and
+# `HEAD.zip` works for both cases.  In future we could switch this to
+# `main.zip` perhaps.
+emsdk_zip_download_url = 'https://github.com/emscripten-core/emsdk/archive/HEAD.zip'
 
 zips_subdir = 'zips/'
 

From 05328c455991a50550933a8eda9cb4952af1c93d Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 3 May 2021 16:35:09 -0700
Subject: [PATCH 159/161] Add warning to those using `master` branch (#810)

---
 emsdk.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/emsdk.py b/emsdk.py
index 113027b9b3..efa60b2efb 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2842,6 +2842,18 @@ def expand_sdk_name(name, activating):
 
 
 def main(args):
+
+  if is_emsdk_sourced_from_github():
+    # This code only exists on the master branch
+    errlog('****')
+    errlog('Warning: You appear to be using the `master` branch of emsdk.')
+    errlog('We recently made the switch to using `main`')
+    errlog('In order to continue to receive updates you will need to make the switch locally too.')
+    errlog('For normal clones without any local branches simply running the following command should be enough:')
+    errlog('  `git checkout main`')
+    errlog('For more information see https://github.com/emscripten-core/emsdk/issues/805')
+    errlog('****')
+
   if not args:
     errlog("Missing command; Type 'emsdk help' to get a list of commands.")
     return 1

From 619a2895bb399932be4cded323c5d9e7bbc251eb Mon Sep 17 00:00:00 2001
From: juj <jujjyl@gmail.com>
Date: Wed, 5 May 2021 04:02:25 +0300
Subject: [PATCH 160/161] Remove explicit closure install step, the first
 install command does already seem to install google-closure-compiler-windows
 at least. (#803)

---
 emsdk.py | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/emsdk.py b/emsdk.py
index efa60b2efb..962214c3ea 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -1418,34 +1418,6 @@ def emscripten_npm_install(tool, directory):
     errlog('Error running %s:\n%s' % (e.cmd, e.output))
     return False
 
-  # Manually install the appropriate native Closure Compiler package
-  # This is currently needed because npm ci will install the packages
-  # for Closure for all platforms, adding 180MB to the download size
-  # There are two problems here:
-  #   1. npm ci does not consider the platform of optional dependencies
-  #      https://github.com/npm/cli/issues/558
-  #   2. A bug with the native compiler has bloated the packages from
-  #      30MB to almost 300MB
-  #      https://github.com/google/closure-compiler-npm/issues/186
-  # If either of these bugs are fixed then we can remove this exception
-  closure_compiler_native = ''
-  if LINUX and ARCH in ('x86', 'x86_64'):
-    closure_compiler_native = 'google-closure-compiler-linux'
-  if MACOS and ARCH in ('x86', 'x86_64'):
-    closure_compiler_native = 'google-closure-compiler-osx'
-  if WINDOWS and ARCH == 'x86_64':
-    closure_compiler_native = 'google-closure-compiler-windows'
-  if closure_compiler_native:
-    print('Running post-install step: npm install', closure_compiler_native)
-    try:
-      subprocess.check_output(
-        [npm, 'install', '--production', '--no-optional', closure_compiler_native],
-        cwd=directory, stderr=subprocess.STDOUT, env=env,
-        universal_newlines=True)
-    except subprocess.CalledProcessError as e:
-      errlog('Error running %s:\n%s' % (e.cmd, e.output))
-      return False
-
   print('Done running: npm ci')
   return True
 

From 7e3c0461444bc2b3ad33b32fe89867d626e0f9f5 Mon Sep 17 00:00:00 2001
From: Alon Zakai <azakai@google.com>
Date: Mon, 24 May 2021 12:59:32 -0700
Subject: [PATCH 161/161] Error on the master branch, and direct people to
 main. See #805 (#823)

See #805

The behavior is now:

$ ./emsdk install 2.0.0
****
Error: You appear to be using the `master` branch of emsdk.
We recently made the switch to using `main`
In order to continue to receive updates you will need to make the switch locally too.
For normal clones without any local branches simply running the following command should be enough:
  `git checkout main`
For more information see https://github.com/emscripten-core/emsdk/issues/805
****
$ echo $?
1

If you see this error, you are using master, and should switch to main,
which is where development now occurs.
---
 emsdk.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emsdk.py b/emsdk.py
index 962214c3ea..657d1d57e5 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2818,13 +2818,14 @@ def main(args):
   if is_emsdk_sourced_from_github():
     # This code only exists on the master branch
     errlog('****')
-    errlog('Warning: You appear to be using the `master` branch of emsdk.')
+    errlog('Error: You appear to be using the `master` branch of emsdk.')
     errlog('We recently made the switch to using `main`')
     errlog('In order to continue to receive updates you will need to make the switch locally too.')
     errlog('For normal clones without any local branches simply running the following command should be enough:')
     errlog('  `git checkout main`')
     errlog('For more information see https://github.com/emscripten-core/emsdk/issues/805')
     errlog('****')
+    return 1
 
   if not args:
     errlog("Missing command; Type 'emsdk help' to get a list of commands.")