From cc1375baa10575000507ac2b51f70d4c9aa020a9 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 12 Jul 2021 13:04:00 +0200 Subject: [PATCH] Wasm: Only detect toolchains from the emsdk installation device Change-Id: I910365c6e02e714adf1a233b42df86110cf65a0a Reviewed-by: Alessandro Portale --- src/plugins/webassembly/webassemblytoolchain.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/plugins/webassembly/webassemblytoolchain.cpp b/src/plugins/webassembly/webassemblytoolchain.cpp index c7755db21eb..276b324ba64 100644 --- a/src/plugins/webassembly/webassemblytoolchain.cpp +++ b/src/plugins/webassembly/webassemblytoolchain.cpp @@ -168,6 +168,13 @@ QList WebAssemblyToolChainFactory::autoDetect( if (!WebAssemblyEmSdk::isValid(sdk)) return {}; + if (device) { + // Only detect toolchains from the emsdk installation device + const FilePath deviceRoot = device->mapToGlobalPath({}); + if (deviceRoot.host() != sdk.host()) + return {}; + } + Environment env = sdk.deviceEnvironment(); WebAssemblyEmSdk::addToEnvironment(sdk, env);