diff options
| author | David Skoland <david.skoland@qt.io> | 2022-09-20 11:18:58 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-11-09 06:53:59 +0000 |
| commit | 9fc871298c173d19a16a381f78324d6ddaa71eb6 (patch) | |
| tree | 194da8584e0b8ca8d3413a68644b81c3c85994cd | |
| parent | 43a8ea3bbd0490eed0b526771ae457172d8a9a5f (diff) | |
wasm: Add actual emscripten installation to path in coin
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 <morten.sorvig@qt.io>
(cherry picked from commit 4a6f43ed8d4abdd4e862a65aded02a8f000d7238)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | coin/provisioning/common/unix/emsdk.sh | 11 |
1 files 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 |