Remove workaround for Windows for discovering visual studio, we now use vswhere. Fixes #492

(cherry picked from commit 18d8563)

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java

@@ -366,15 +366,6 @@ public void postInitialize(Python3Core core) {
         if (PythonOS.getPythonOS() == PythonOS.PLATFORM_WIN32) {
             // XXX: Until we fix pip
             environ.setItem(toTruffleStringUncached("PIP_NO_CACHE_DIR"), toTruffleStringUncached("0"));
-            // XXX: Until we have working winapi and winreg modules for MSVC discovery
-            environ.setItem(toTruffleStringUncached("DISTUTILS_USE_SDK"), toTruffleStringUncached("1"));
-            if (getenv.get("MSSdk") == null) {
-                String sdkdir = getenv.get("WindowsSdkDir");
-                if (sdkdir == null) {
-                    sdkdir = "unset";
-                }
-                environ.setItem(toTruffleStringUncached("MSSdk"), toTruffleStringUncached(sdkdir));
-            }
         }
         PythonModule posix;
         if (PythonOS.getPythonOS() == PythonOS.PLATFORM_WIN32) {

mx.graalpython/mx_graalpython.py

@@ -170,6 +170,8 @@ def getArchivableResultsWithLib(self, *args, **kwargs):
             if os.path.isfile(os.path.join(os.path.abspath(p), "cl.exe")):
                 mx.log("LIB and INCLUDE set, cl.exe on PATH, assuming this is a VS shell")
                 os.environ["DISTUTILS_USE_SDK"] = "1"
+                if not os.environ.get("MSSdk"):
+                    os.environ["MSSdk"] = os.environ.get("WindowsSdkDir", "unset")
                 break
         else:
             mx.log("cl.exe not on PATH, not a VS shell")