From 105d65b19c80795aada03b2b1b5a82a409a5333e Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 30 Mar 2021 15:02:11 +0200 Subject: [PATCH] WebAssembly: Always use system environment to run em++ -dumpversion 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 --- src/plugins/webassembly/webassemblyemsdk.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/plugins/webassembly/webassemblyemsdk.cpp b/src/plugins/webassembly/webassemblyemsdk.cpp index e2185b0a566..5997c83f06d 100644 --- a/src/plugins/webassembly/webassemblyemsdk.cpp +++ b/src/plugins/webassembly/webassemblyemsdk.cpp @@ -104,10 +104,7 @@ QVersionNumber WebAssemblyEmSdk::version(const FilePath &sdkRoot) return {}; const QString cacheKey = sdkRoot.toString(); if (!emSdkVersionCache()->contains(cacheKey)) { - Environment env; - // Non-Windows: Need python in path (not provided by emsdk), thus use systemEnvironment - if (!HostOsInfo::isWindowsHost()) - env = Environment::systemEnvironment(); + Environment env = Environment::systemEnvironment(); WebAssemblyEmSdk::addToEnvironment(sdkRoot, env); const QString scriptFile = QLatin1String("emcc") + QLatin1String(HostOsInfo::isWindowsHost() ? ".bat" : "");