feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

WebAssembly: Always use system environment to run em++ -dumpversion

Browse Source 
On Windows, we would start with a clean environment just with the emsdk
environment added in order to run "em++.bat -dumpversion".

That fails for some emsdk versions for reasons unknown. Let's reduce OS-
specific special casing and instead use the system environment as basis
everywhere.

Change-Id: I143fe6193528390e17ee0a62936ad03d2c5a109e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Alessandro Portale
2021-03-30 15:02:11 +02:00
parent 98012fb89d
commit 105d65b19c
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/webassembly/webassemblyemsdk.cpp
View File

@@ -104,10 +104,7 @@ QVersionNumber WebAssemblyEmSdk::version(const FilePath &sdkRoot)
return {}; return {};
const QString cacheKey = sdkRoot.toString(); const QString cacheKey = sdkRoot.toString();
if (!emSdkVersionCache()->contains(cacheKey)) { if (!emSdkVersionCache()->contains(cacheKey)) {
Environment env; Environment env = Environment::systemEnvironment();
// Non-Windows: Need python in path (not provided by emsdk), thus use systemEnvironment
if (!HostOsInfo::isWindowsHost())
env = Environment::systemEnvironment();
WebAssemblyEmSdk::addToEnvironment(sdkRoot, env); WebAssemblyEmSdk::addToEnvironment(sdkRoot, env);
const QString scriptFile = const QString scriptFile =
QLatin1String("emcc") + QLatin1String(HostOsInfo::isWindowsHost() ? ".bat" : ""); QLatin1String("emcc") + QLatin1String(HostOsInfo::isWindowsHost() ? ".bat" : "");