4 files changed, 28 insertions, 2 deletions
diff --git a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
index 1be4a4e6d..d160aea12 100644
--- a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
+++ b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
@@ -18,7 +18,9 @@ foreach ($instance in $VisualStudio2017InstallationInstances)
 }
 
 # VS2015
-$CandidateProgramFiles = "${env:PROGRAMFILES(X86)}", "${env:PROGRAMFILES}"
+$programFiles32 = & $scriptsDir\getProgramFiles32bit.ps1
+$programFilesP = & $scriptsDir\getProgramFilesPlatformBitness.ps1
+$CandidateProgramFiles = $programFiles32, $programFilesP
 foreach ($ProgramFiles in $CandidateProgramFiles)
 {
     $clExe= "$ProgramFiles\Microsoft Visual Studio 14.0\\VC\bin\cl.exe"
diff --git a/scripts/findTargetPlatformVersion.ps1 b/scripts/findTargetPlatformVersion.ps1
index d3dba73f1..650e0b4ed 100644
--- a/scripts/findTargetPlatformVersion.ps1
+++ b/scripts/findTargetPlatformVersion.ps1
@@ -4,7 +4,9 @@ param(
 )
 
 $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
-$CandidateProgramFiles = "${env:PROGRAMFILES(X86)}", "${env:PROGRAMFILES}"
+$programFiles32 = & $scriptsDir\getProgramFiles32bit.ps1
+$programFilesP = & $scriptsDir\getProgramFilesPlatformBitness.ps1
+$CandidateProgramFiles = $programFiles32, $programFilesP
 
 # Windows 10 SDK
 foreach ($ProgramFiles in $CandidateProgramFiles)
diff --git a/scripts/getProgramFiles32bit.ps1 b/scripts/getProgramFiles32bit.ps1
new file mode 100644
index 000000000..fd7167191
--- /dev/null
+++ b/scripts/getProgramFiles32bit.ps1
@@ -0,0 +1,11 @@
+[CmdletBinding()]
+param(
+
+)
+
+if (Test-Path env:PROGRAMFILES`(X86`))
+{
+    return ${env:PROGRAMFILES(X86)}
+}
+
+return ${env:PROGRAMFILES}
+\ No newline at end of file
diff --git a/scripts/getProgramFilesPlatformBitness.ps1 b/scripts/getProgramFilesPlatformBitness.ps1
new file mode 100644
index 000000000..6d0a513ca
--- /dev/null
+++ b/scripts/getProgramFilesPlatformBitness.ps1
@@ -0,0 +1,11 @@
+[CmdletBinding()]
+param(
+
+)
+
+if (Test-Path env:ProgramW6432)
+{
+    return ${env:ProgramW6432}
+}
+
+return ${env:PROGRAMFILES}
+\ No newline at end of file