Fixes default per-user install precompiling the standard library.

1 files changed, 8 insertions, 5 deletions

diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
index 435cde3e0c..351218e030 100644
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
@@ -302,10 +302,17 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
 
         case ID_INSTALL_JUST_FOR_ME_BUTTON:
             SavePageSettings();
-            
+
+            if (!QueryElevateForCrtInstall()) {
+                break;
+            }
+
             hr = _engine->SetVariableNumeric(L"InstallAllUsers", 0);
             ExitOnFailure(hr, L"Failed to set install scope");
 
+            hr = _engine->SetVariableNumeric(L"CompileAll", 0);
+            ExitOnFailure(hr, L"Failed to unset CompileAll");
+
             hr = BalGetStringVariable(L"DefaultJustForMeTargetDir", &defaultDir);
             BalExitOnFailure(hr, "Failed to get the default per-user install directory");
 
@@ -320,10 +327,6 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
             ReleaseStr(targetDir);
             BalExitOnFailure(hr, "Failed to set install target directory");
 
-            if (!QueryElevateForCrtInstall()) {
-                break;
-            }
-
             OnPlan(BOOTSTRAPPER_ACTION_INSTALL);
             break;