From 65915162301cbab8a19c64ae1f06c53793c9d6fb Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Thu, 26 May 2022 13:20:02 -0700
Subject: [PATCH] Do not add x86 host to PATH on 64-bit machines

---
 src/installer/pkg/sfx/installers/host.wxs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/installer/pkg/sfx/installers/host.wxs b/src/installer/pkg/sfx/installers/host.wxs
index 6ff59fa6c29c83..322b9038d92939 100644
--- a/src/installer/pkg/sfx/installers/host.wxs
+++ b/src/installer/pkg/sfx/installers/host.wxs
@@ -42,6 +42,9 @@
         <?if $(var.Platform)~=x64 ?>
         <!-- For x64 installer, only add to PATH when actually on native architecture -->
         <Condition>NOT NON_NATIVE_ARCHITECTURE</Condition>
+        <?elseif $(var.Platform)~=x86 ?>
+        <!-- For x86 installer, only add to PATH when not on 64-bit platform -->
+        <Condition>NOT VersionNT64</Condition>
         <?endif?>
 
         <!-- A stable keypath with the right SxS characteristics for our PATH entry-->