From 9fc871298c173d19a16a381f78324d6ddaa71eb6 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Tue, 20 Sep 2022 11:18:58 +0200 Subject: [PATCH] wasm: Add actual emscripten installation to path in coin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I'm not sure where the emscripten-$version came from, maybe that's how it used to be? In any case, in the current version (3.1.x), the installation folder is in upstream/emscripten, so add PATH there to access all emscripten utils. Change-Id: I648feae21bc5caecc3f0bf0a7d16238680a85590 Reviewed-by: Morten Johan Sørvig (cherry picked from commit 4a6f43ed8d4abdd4e862a65aded02a8f000d7238) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/emsdk.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh index b33a6883..70e500c8 100755 --- a/coin/provisioning/common/unix/emsdk.sh +++ b/coin/provisioning/common/unix/emsdk.sh @@ -58,9 +58,12 @@ else pathNodeExecutable="node-$versionNode-linux-x64/bin/node" fi -SetEnvVar "PATH" "\"\$PATH:/opt/emsdk/emscripten-$version/\"" -SetEnvVar "EMSCRIPTEN" "/opt/emsdk/emscripten-$version" -SetEnvVar "EMSDK" "/opt/emsdk" -SetEnvVar "EMSDK_NODE" "/opt/emsdk/$pathNodeExecutable" +emsdkPath="/opt/emsdk/" +emscriptenPath="${emsdkPath}upstream/emscripten/" + +SetEnvVar "PATH" "\"\$PATH:${emscriptenPath}\"" +SetEnvVar "EMSCRIPTEN" "${emscriptenPath}" +SetEnvVar "EMSDK" "${emsdkPath}" +SetEnvVar "EMSDK_NODE" "${emsdkPath}${pathNodeExecutable}" echo "Emsdk = $version" >> ~/versions.txt