From a2fcf072e8ab42b121fbc81509c9793875846c12 Mon Sep 17 00:00:00 2001
From: Zoltan Varga <vargaz@gmail.com>
Date: Tue, 21 Jul 2020 07:31:37 -0400
Subject: [PATCH] Bump emscripten to 1.39.20. (#20143)

---
 sdks/builds/wasm.mk   | 2 +-
 sdks/wasm/Makefile    | 2 +-
 sdks/wasm/packager.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdks/builds/wasm.mk b/sdks/builds/wasm.mk
index 5a4b168a6ec..e8cfb57176c 100644
--- a/sdks/builds/wasm.mk
+++ b/sdks/builds/wasm.mk
@@ -1,7 +1,7 @@
 #emcc has lots of bash'isms
 SHELL:=/bin/bash
 
-EMSCRIPTEN_VERSION=1.39.18
+EMSCRIPTEN_VERSION=1.39.20
 EMSCRIPTEN_LOCAL_SDK_DIR=$(TOP)/sdks/builds/toolchains/emsdk
 
 EMSCRIPTEN_SDK_DIR ?= $(EMSCRIPTEN_LOCAL_SDK_DIR)
diff --git a/sdks/wasm/Makefile b/sdks/wasm/Makefile
index 00188090061..29553fcd7b2 100644
--- a/sdks/wasm/Makefile
+++ b/sdks/wasm/Makefile
@@ -132,7 +132,7 @@ provision-emsdk:
 
 # emsdk_env.sh calls emsdk construct_env which is a bit slow so make a copy
 emsdk_env.sh: | provision-emsdk
-	cd $(EMSCRIPTEN_SDK_DIR) && ./emsdk construct_env $(CURDIR)/emsdk_env.sh
+	cd $(EMSCRIPTEN_SDK_DIR) && ./emsdk construct_env > $(CURDIR)/emsdk_env.sh
 
 # These builds overwrite their installed files
 # forcing everything to be rebuilt so use a stamp file
diff --git a/sdks/wasm/packager.cs b/sdks/wasm/packager.cs
index ff6f68e2218..ede46f44f6a 100644
--- a/sdks/wasm/packager.cs
+++ b/sdks/wasm/packager.cs
@@ -923,7 +923,7 @@ class Driver {
 		ninja.WriteLine ("  restat = true");
 		ninja.WriteLine ("  description = [CPIFDIFF] $in -> $out");
 		ninja.WriteLine ("rule create-emsdk-env");
-		ninja.WriteLine ("  command = $emscripten_sdkdir/emsdk construct_env $out");
+		ninja.WriteLine ("  command = $emscripten_sdkdir/emsdk construct_env > $out");
 		ninja.WriteLine ("rule emcc");
 		ninja.WriteLine ("  command = bash -c '$emcc $emcc_flags $flags -c -o $out $in'");
 		ninja.WriteLine ("  description = [EMCC] $in -> $out");
-- 
2.11.4.GIT