From 471ae0bdea789471f510d195f5536ae5eeafff09 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 6 Oct 2022 18:37:11 -0700
Subject: [PATCH] Set EM_CONFIG rather then running emsdk_env.sh.

Since https://github.com/emscripten-core/emsdk/pull/1110 landed emsdk
no longer set `EM_CONFIG` so we need to do that (in order to make our
local version of emscripten use the config from emsdk).
---
 .circleci/config.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8c5a223e95035..4254d5ca9530a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -43,7 +43,11 @@ commands:
     steps:
       - run:
           name: emsdk_env.sh
-          command: echo "EMSDK_QUIET=1 source ~/emsdk/emsdk_env.sh" >> $BASH_ENV
+          command: |
+            echo "EMSDK_QUIET=1 source ~/emsdk/emsdk_env.sh" >> $BASH_ENV
+            # In order make our external version of emscripten use the emsdk
+            # config we need to explictly set EM_CONFIG here.
+            echo "export EM_CONFIG=~/emsdk/.emscripten" >> $BASH_ENV
   npm-install:
     description: "npm ci"
     steps: