From 9ba2dd3df8b20d6c161f3f87b9428833cfc946d6 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Thu, 5 Apr 2018 02:02:12 +0200
Subject: [PATCH] Apply auto-tester's patching to upstream

---
 test/tools/d_do_test.d | 2 +-
 win32.mak              | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/tools/d_do_test.d b/test/tools/d_do_test.d
index 92bc47620e91..e24366584a39 100755
--- a/test/tools/d_do_test.d
+++ b/test/tools/d_do_test.d
@@ -586,7 +586,7 @@ int tryMain(string[] args)
         switch (envData.os)
         {
             case "win32": envData.ccompiler = "dmc"; break;
-            case "win64": envData.ccompiler = `\"Program Files (x86)"\"Microsoft Visual Studio 10.0"\VC\bin\amd64\cl.exe`; break;
+            case "win64": envData.ccompiler = environment.get("VCBIN_DIR") ~ `\cl.exe`; break;
             default:      envData.ccompiler = "c++"; break;
         }
     }
diff --git a/win32.mak b/win32.mak
index dfda4fe75fa9..abc756f9a1c4 100644
--- a/win32.mak
+++ b/win32.mak
@@ -1,13 +1,12 @@
-MAKE=make
 
 auto-tester-build:
 	cd src
-	$(MAKE) -f win32.mak auto-tester-build
+	make -f win32.mak auto-tester-build
 	cd ..
 
 auto-tester-test:
 	cd test
-	$(MAKE)
+	gmake -j$(PARALLELISM)
 	cd ..
 	cd samples
 	gmake -f win32.mak DMD=..\src\dmd.exe MODEL=$(MODEL) "LIB=..\..\phobos;$(LIB)" \