From 3bdd684d5664573ec95fdea3366f561bdd5f2de5 Mon Sep 17 00:00:00 2001
From: Rainer Schuetze <r.sagitario@gmx.de>
Date: Sun, 6 Nov 2016 10:52:02 +0100
Subject: [PATCH 1/2] do not enforce specific MS C runtime

---
 src/rt/monitor_.d | 5 -----
 win64.mak         | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/rt/monitor_.d b/src/rt/monitor_.d
index f73e32137b..be0672e255 100644
--- a/src/rt/monitor_.d
+++ b/src/rt/monitor_.d
@@ -155,11 +155,6 @@ version (Windows)
     {
         pragma(lib, "snn.lib");
     }
-    else version (CRuntime_Microsoft)
-    {
-        pragma(lib, "libcmt.lib");
-        pragma(lib, "oldnames.lib");
-    }
     import core.sys.windows.windows;
 
     alias Mutex = CRITICAL_SECTION;
diff --git a/win64.mak b/win64.mak
index fea4d5d475..95e141144a 100644
--- a/win64.mak
+++ b/win64.mak
@@ -22,7 +22,7 @@ UDFLAGS=-m$(MODEL) -conf= -O -release -dip25 -w -Isrc -Iimport
 DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc
 
 #CFLAGS=/O2 /I"$(VCDIR)"\INCLUDE /I"$(SDKDIR)"\Include
-CFLAGS=/Z7 /I"$(VCDIR)"\INCLUDE /I"$(SDKDIR)"\Include
+CFLAGS=/Z7 /Zl /I"$(VCDIR)"\INCLUDE /I"$(SDKDIR)"\Include
 
 DRUNTIME_BASE=druntime$(MODEL)
 DRUNTIME=lib\$(DRUNTIME_BASE).lib

From 3251f097606d4b34a6b9716d8525d3fd03a0fd93 Mon Sep 17 00:00:00 2001
From: Rainer Schuetze <r.sagitario@gmx.de>
Date: Wed, 9 Nov 2016 22:32:15 +0100
Subject: [PATCH 2/2] move new switch into separate line to not cause merge
 conflict with the auto tester

---
 win64.mak | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/win64.mak b/win64.mak
index 95e141144a..89f28a4941 100644
--- a/win64.mak
+++ b/win64.mak
@@ -22,12 +22,15 @@ UDFLAGS=-m$(MODEL) -conf= -O -release -dip25 -w -Isrc -Iimport
 DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc
 
 #CFLAGS=/O2 /I"$(VCDIR)"\INCLUDE /I"$(SDKDIR)"\Include
-CFLAGS=/Z7 /Zl /I"$(VCDIR)"\INCLUDE /I"$(SDKDIR)"\Include
+CFLAGS=/Z7 /I"$(VCDIR)"\INCLUDE /I"$(SDKDIR)"\Include
 
 DRUNTIME_BASE=druntime$(MODEL)
 DRUNTIME=lib\$(DRUNTIME_BASE).lib
 GCSTUB=lib\gcstub$(MODEL).obj
 
+# do not preselect a C runtime (extracted from the line above to make the auto tester happy)
+CFLAGS=$(CFLAGS) /Zl
+
 DOCFMT=
 
 target : import copydir copy $(DRUNTIME) $(GCSTUB)