Use the same PATH on msvc and gnu targets

Author: alexcrichton

master/master.cfg

@@ -701,24 +701,16 @@ class CommandEnv(object):
         if "buildername" in props:
             win32toolchain = r"c:\mingw-w64\i686-4.9.1-win32-dwarf-rt_v3-rev1\mingw32\bin"
             win64toolchain = r"c:\mingw-w64\x86_64-4.9.1-win32-seh-rt_v3-rev1\mingw64\bin"
+            name = props["buildername"]
 
             # This is required to trigger certain workarounds done
             # slave-side by buildbot. In particular omitting the PWD
             # variable with an unmangled pathname.
-            if "win-gnu-32" in props["buildername"]:
-                env["MACHTYPE"] = "i686-pc-msys"
-                env["MSYSTEM"] = "MINGW32"
-                env["PATH"] = win32toolchain + ";c:\\msys64\\usr\\bin;${PATH};c:\\msys64\\mingw32\\bin"
-            if "win-gnu-64" in props["buildername"]:
-                env["MACHTYPE"] = "x86_64-pc-msys"
-                env["MSYSTEM"] = "MINGW64"
-                env["PATH"] = win64toolchain + ";c:\\msys64\\usr\\bin;${PATH};c:\\msys64\\mingw64\\bin"
-
-            if "win-msvc-32" in props["buildername"]:
+            if "win-msvc-32" in name or "win-gnu-32" in name:
                 env["MACHTYPE"] = "i686-pc-win32"
                 env["MSYSTEM"] = "MINGW32"
                 env["PATH"] = win32toolchain + ";c:\\msys64\\mingw32\\bin;c:\\msys64\\usr\\bin;${PATH}"
-            if "win-msvc-64" in props["buildername"]:
+            if "win-msvc-64" in name or "win-gnu-64" in name:
                 env["MACHTYPE"] = "x86_64-pc-win32"
                 env["MSYSTEM"] = "MINGW64"
                 env["PATH"] = win64toolchain + ";c:\\msys64\\mingw64\\bin;c:\\msys64\\usr\\bin;${PATH}"